DL6ER
|
f20e4ddf3b
|
Change message for unknown state to something more useful
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
40656641b6
|
Merge branch 'development' into tweak/reload_on_enable_disable
|
6 years ago |
Mark Drobnak
|
a9c6d79cda
|
Merge pull request #2394 from pi-hole/fix/pihole-FTL_owner_group
Ensure proper unprivileged user if pihole-FTL is started as root
|
6 years ago |
DL6ER
|
45bf4b02e7
|
Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Mark Drobnak
|
667c5138cc
|
Merge pull request #2381 from pi-hole/fix/existing_dnsmasq.conf
Improve /etc/dnsmasq.conf handling
|
6 years ago |
DL6ER
|
b9d47d0dd2
|
Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps
Start pihole-FTL as root if capabilities are not supported by the system
|
6 years ago |
DL6ER
|
1813c25117
|
If config file was backed up: Print info message
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
940c9c3bae
|
Merge pull request #2383 from pi-hole/feature/privacy-level-4
Add support for privacy level 4
|
6 years ago |
Mark Drobnak
|
9235a11d5f
|
Merge pull request #2382 from pi-hole/tweak/no-extra-logging
Don't use extra query logging
|
6 years ago |
Mcat12
|
f141b9f778
|
Add support for privacy level 4
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
6 years ago |
DL6ER
|
1dca1efbc6
|
Don't use extra query logging
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
28c6b1393f
|
Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
6c97b8b875
|
Merge pull request #2377 from pi-hole/fix/service-touch-leases
Touch dhcp.leases to ensure it exists
|
6 years ago |
DL6ER
|
ec2426b24d
|
Add clarifying comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
5cd3b11391
|
Start pihole-FTL as root if capabilities are not supported by the system
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
d30b565d98
|
Touch dhcp.leases to ensure it exists. There are some systems out there where the installer didn't finish on the first run and some users don't have this file being created. Although /etc/pihole should be owned by pihole:pihole, pihole-FTL sometimes fails to open this file and - if this is the case and DHCP is enabled - refuses to start altogether.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Mark Drobnak
|
74008d28a7
|
Merge pull request #2367 from realtebo/fix-enabling-ftl
Fix to enable pihole-FTL service before starting it
|
6 years ago |
Realtebo
|
0d1b3cee4f
|
Enable FTL service before starting it
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
|
6 years ago |
Realtebo
|
0b44cb4426
|
Merge branch 'development' of https://github.com/pi-hole/pi-hole into development
|
6 years ago |
Mark Drobnak
|
eb8e4496b2
|
Merge pull request #2354 from realtebo/development
Create adlist file while running unattended setup
|
6 years ago |
Realtebo
|
30f45d4df7
|
Merge branch 'development' of https://github.com/pi-hole/pi-hole into development
|
6 years ago |
Mark Drobnak
|
24e1c78d52
|
Merge pull request #2358 from pi-hole/fix/restart_FTl_on_logflush
Restart pihole-FTL after log flushing
|
6 years ago |
Mirko Tebaldi
|
476fecbcf5
|
Fixed typos as suggestes
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
|
6 years ago |
Mirko Tebaldi
|
327b58fa03
|
Merge pull request #1 from pi-hole/development
Merge with current main development branch
|
6 years ago |
DL6ER
|
d3eea9404d
|
Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg
Improve error message when downloading FTL failed
|
6 years ago |
DL6ER
|
ca309d3b28
|
Restart pihole-FTL after log flushing to force reloading history. Fixes #2339
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
0ebd68f17f
|
Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Mark Drobnak
|
3696373609
|
Merge pull request #2345 from pi-hole/NXDOMAIN-tail
Fix colour tail for use with new blocking methods
|
6 years ago |
DL6ER
|
165affc39b
|
list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
f794018e0c
|
Acknowledge temporary file if disabled for "pihole -b" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
337cc5ca18
|
BLOCKING -> BLOCKING_ENABLED
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
4e4d6b5d1f
|
Adjust "pihole status" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
b011adc453
|
Use new setupVars BLOCKING variable to determine which file to update via gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
d8abc1d266
|
Storing BLOCKING=true/false in setupVars.conf
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
6cde066edd
|
Have gravity detect the presence of files like gravity.list.bck and update this file if present (assuming blocking is disabled)
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
WaLLy3K
|
d163e38380
|
Ensure regex-blocked lines are red
* Add `regex.list` to seds list
Signed-off-by: WaLLy3K <wally3k@pihole.net>
|
6 years ago |
Realtbo
|
d9195970b7
|
Create adlist file while running unattended setup
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
|
6 years ago |
DL6ER
|
20b946eae5
|
Instead of changing the dnsmasq configuration, we replace gravity.list and black.list by empty files for disabling. When pihole-FTL receives SIGHUP, it will clear its cache and reload all configured lists. If the files are empty, blocking will be disabled as no content to be blocked will be imported.
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
c00357663b
|
Reload pihole-FTL instead of restart the entire service on "pihole enable/disable"
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
WaLLy3K
|
a1bf9fad98
|
Fix colour tail for use with new blocking methods
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
|
6 years ago |
Mark Drobnak
|
afdc4219d0
|
Merge pull request #2343 from pi-hole/tweak/audit_log
Add facility to add multiple audit list entries at once and to nuke audit list
|
6 years ago |
DL6ER
|
94e4ed6644
|
Add facility to add multiple audit list entries at once and to nuke audit list
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
Mark Drobnak
|
ef8aaba014
|
Merge pull request #2320 from TronPaul/fix/no-tty
set noninteractive during unattended install
|
6 years ago |
Mark Drobnak
|
d2ae07e69b
|
Merge pull request #2334 from pi-hole/fix/gravity-count-regex
Fix gravity's regex counting logic
|
6 years ago |
DL6ER
|
760dd01b50
|
Use grep invert-match
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
5bf90cb77d
|
Use alternative logic for counting regex file entries, skipping commented out lines
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
f5c3dc5d9d
|
Improve download error message that is shown when downloading or verifying the binary failed
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
6 years ago |
DL6ER
|
f2b820079a
|
Merge pull request #2329 from pi-hole/tweak/remove-ppc
Remove PowerPC from FTL binaries
|
6 years ago |
WaLLy3K
|
083024496a
|
Merge pull request #2327 from pi-hole/header-fix
Fix Chronometer heading
|
6 years ago |
Mcat12
|
e01eea8ba8
|
Remove PowerPC from FTL binaries
It is no longer built, and may cause 404 errors if it attempts to
download the binary.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
6 years ago |