08cf9aa5a7
Declare and assign 'logging_enabled' separately
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-06-19 12:25:38 +02:00
1ae67e1de8
Only inform user about disabled logging, don't skipp printing pihole.log
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-06-19 12:25:38 +02:00
f2cba6cad1
Skip analyze_pihole_log if query logging has been disabled
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-06-19 12:25:38 +02:00
df3c46349a
Add tail of pihole.log to debug output
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2021-06-19 12:25:38 +02:00
a2d5b8050a
Update gravity.sh
...
Signed-off-by: jpgpi250 <jpgpi250@gmail.com >
2021-06-14 20:27:10 +02:00
01c310a78f
Fix typo
...
Signed-off-by: William Horning <williamhorning@wgyt.tk >
2021-06-10 19:23:58 -04:00
a9e761ec13
Add missing sed anchors when deleting lines.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-05-23 12:11:04 +02:00
761c1cd305
Merge pull request #4175 from ashuio/development
...
Added docker to README
2021-05-20 18:49:01 +01:00
6f60555f79
Added install Method 3
...
Signed-off-by: Ashutosh Verma <mail@ashu.io >
2021-05-20 22:34:19 +05:30
c901443676
Remove false statement about dependency removal on Raspbian
...
The statement "All dependencies are safe to remove on Raspbian" has been added at a time where a much smaller list of dependencies were installed, all indeed relatively safe to purge. Nowadays this list has grown and includes important system packages, like iproute2, psmisc, sudo, curl and others, which are often again dependencies of other packages, like network stacks (ifupdown) and others, so that inexperienced users, following that statement, may break their systems network capabilities and more.
This message has hence been removed.
Signed-off-by: MichaIng <micha@dietpi.com >
2021-05-02 13:29:28 +02:00
a51be7d498
Merge pull request #4153 from MichaIng/patch-2
...
Re-remove wget from dependencies
2021-05-01 00:09:19 +01:00
f3ceebbe06
Re-remove wget from dependencies
...
The dependency has been removed here: https://github.com/pi-hole/pi-hole/pull/3185
But accidentally re-added here: 982c1b0059 (diff-595630a29a855f6d667a84ca0662042e826bf3ec56322ef61d4a6ef149147d23)micha@dietpi.com >
2021-04-30 20:48:12 +02:00
57d9b96b53
Merge pull request #4143 from pi-hole/version-fullstops
...
Cosmetic change to pihole -v -c output
2021-04-25 17:47:40 +01:00
5895690b58
this has been annoying me for months
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-04-24 15:38:27 +01:00
d26f8dd665
Merge pull request #4135 from MichaIng/patch-1
...
Enable PHP8 support for Debian/Ubuntu
2021-04-21 20:19:25 +02:00
2ba350984f
Enable PHP8 support for Debian/Ubuntu
...
Since PHP8.0, the JSON extension is a core PHP extension and hence the php8.0-json package does not exist and is not required:
- https://www.php.net/manual/json.installation.php
- https://packages.debian.org/php8.0-json
Solves: https://discourse.pi-hole.net/t/php-8-packages-not-found/46286
Signed-off-by: MichaIng <micha@dietpi.com >
2021-04-18 15:33:05 +02:00
60513f93a3
Don't set IPV{4,6}_ADDRESS in conftest.py
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-04-18 09:26:23 +02:00
3b574096b8
Remove duplicated lo test
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-04-16 12:28:00 +02:00
58905a1188
Modify debugger to test name resolution on all available interfaces
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-04-16 12:14:05 +02:00
aa88be335e
Acknowledge that IPV{4,6}_ADDRESS may not exist
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-04-16 11:44:54 +02:00
f90dffbf1a
Do not put hostname and pi.hole into local.list - this will be handled by FTL after FTL#1111 has been merged
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-04-16 11:41:26 +02:00
1fb6366c41
Merge pull request #4123 from pi-hole/master
...
Master v5.3.1 to development
2021-04-14 14:30:30 -07:00
4736e03108
Merge pull request #4122 from pi-hole/release/v5.3.1
...
HotFix release v5.3.1
2021-04-14 14:10:21 -07:00
18bedc0493
Merge pull request #4121 from pi-hole/fix/port_hash
...
Fix port separator in IPv4 address validation code
2021-04-14 13:59:52 -07:00
74948ae5c1
The correct port separator is '#' not ':' in dnsmasq style. This should not have been changed in #4083 in the first place.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-04-14 22:53:12 +02:00
9b57f7fa33
Merge pull request #4120 from pi-hole/fix/splashPage
...
Add missing closing single quote
2021-04-14 13:50:45 -07:00
866045968d
Add missing closing single quote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2021-04-14 12:27:36 -07:00
f2e0cf8a92
Merge pull request #4117 from pi-hole/master
...
v5.8 master to dev
2021-04-14 12:24:08 -07:00
4c39edbeb9
Merge pull request #4113 from pi-hole/release/v5.3
...
Pi-hole Core v5.3
2021-04-14 19:04:03 +01:00
b388ac5bb5
Merge pull request from GHSA-3597-244c-wrpj
...
Add some validation to passed arguments before running the values through `sed`
2021-04-14 18:16:46 +01:00
7855859726
Merge pull request #4116 from pi-hole/fix/update-readme
...
Update README
2021-04-14 17:57:47 +01:00
5df7ed2f32
Obtain FTL's PID from the PID file ( #4103 )
...
* Try to obtain FTL's PID from the PID file. If this fails, try to identify the main process using pgrep --oldest (instead of relying on pkill finding the right one by itself). This allows the script to work in even when FTL is running inside the memory checker valgrind.
* Rename FTL_PID -> FTL_PID_FILE
* Remove the pgrep fallback after discussions about that it should be more obvious to users if something strange happened to their PID file. Also, simplify the routine using a bashism in the end.
* Shorten if [[ regex ]]
* Use unset instead of emptying the PID variable
Signed-off-by: DL6ER <dl6er@dl6er.de >
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
2021-04-14 09:33:10 -07:00
25ded79190
Update README
2021-04-14 09:26:52 -07:00
d3e00f038b
Merge pull request #4004 from pi-hole/fedora_33_support
...
Fedora 33 Support
2021-04-13 08:41:56 +01:00
d5f13018a7
Merge branch 'release/v5.3' into fedora_33_support
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2021-04-12 20:06:11 -06:00
c6e3805bbb
Merge pull request #4083 from jbzdarkid/patch-2
...
Improve regexes for IPv4 matching
2021-04-12 21:12:20 +01:00
ea451e3c22
Merge pull request #4095 from jbaez/ft-3896
...
Fix error trying to access undefined variables on splash page.
2021-04-12 20:41:25 +01:00
b97f890a8c
Merge pull request #4086 from pi-hole/fix/GRAVITDB_in_pihole-g
...
pihole -g should respose GRAVITYDB in pihole-FTL.conf
2021-04-11 05:18:09 +02:00
6198165df8
Fix error trying to access undefined variables on splash page.
...
Signed-off-by: Jaime Baez <j.baezcastillo@gmail.com >
2021-03-26 23:42:11 +01:00
8090071eff
Update regex to disallow leading zeros
...
Also updated a comment to point to a non-experimental RFC.
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com >
2021-03-21 16:27:08 -07:00
89c80947df
Improve regexes for ipv4 matching
...
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com >
2021-03-21 16:24:35 -07:00
b51751e892
Merge pull request #4084 from jbzdarkid/patch-1
...
Improve comments in basic-install.sh
2021-03-21 23:14:59 +00:00
45d4ab4c22
Add some validation to passed arguments before running the values through sed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2021-03-19 18:39:43 +00:00
f536718aaa
Use possibly custom gravity.db location in the copying SQL script
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-03-18 16:46:59 +01:00
f1740da9ff
Update gravity path in query.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-03-18 09:58:19 +01:00
9bdbe88a66
Update gravity path in list.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-03-18 09:58:19 +01:00
d25240fe9f
pihole -g should respose GRAVITYDB in pihole-FTL.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-03-18 09:00:27 +01:00
20b6f9cceb
Improve comments in basic-install.sh
...
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com >
2021-03-17 18:37:18 -07:00
f27fd9f899
Merge pull request #3982 from andras-tim/list-fix-same-wildcard-regex
...
Fix list: User same wildcard regex that the UI use
2021-03-17 11:20:12 -07:00
13cf0c1288
Aligned pihole logo to center, Fixed responsive issue ( #4036 )
...
* Aligned pihole logo to center, Fixed responsive issue
* removed duplicate instance of #splashpage
Signed-off-by: Dany Gauthier <danygauthier57@yahoo.ca >
2021-03-17 11:18:50 -07:00
