Commit Graph

3631 Commits (05bd88b4d8d8c714772eeeea69317379e512ae04)
 

Author SHA1 Message Date
Patrik Cyvoct 85cf98888d
Merge remote-tracking branch 'origin/development' into ipv6_brackets
6 years ago
Patrik Cyvoct 048e5bb9a2
Remove external ipv6 brackets if any in servername
6 years ago
DL6ER b9d47d0dd2
Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps
6 years ago
DL6ER 1813c25117
If config file was backed up: Print info message
6 years ago
DL6ER 940c9c3bae
Merge pull request #2383 from pi-hole/feature/privacy-level-4
6 years ago
Mcat12 5d0d7336ff
Echo with newline when setting privacy level
6 years ago
Mcat12 6a26a05dbf
Fix privacy level whiptail option format
6 years ago
Mcat12 c22e94c9c7
Update test to include empty FTL config
6 years ago
Mcat12 4aafa8cf47
Set the FTL privacy level during install
6 years ago
Mark Drobnak 9235a11d5f
Merge pull request #2382 from pi-hole/tweak/no-extra-logging
6 years ago
Mcat12 f141b9f778
Add support for privacy level 4
6 years ago
DL6ER 1dca1efbc6
Don't use extra query logging
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"
6 years ago
DL6ER 6c97b8b875
Merge pull request #2377 from pi-hole/fix/service-touch-leases
6 years ago
DL6ER ec2426b24d
Add clarifying comments
6 years ago
DL6ER 5cd3b11391
Start pihole-FTL as root if capabilities are not supported by the system
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.
6 years ago
Mark Drobnak 74008d28a7
Merge pull request #2367 from realtebo/fix-enabling-ftl
6 years ago
Realtebo 0d1b3cee4f Enable FTL service before starting 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
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
6 years ago
Mirko Tebaldi 476fecbcf5 Fixed typos as suggestes
6 years ago
Mirko Tebaldi 327b58fa03
Merge pull request #1 from pi-hole/development
6 years ago
DL6ER d3eea9404d
Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg
6 years ago
DL6ER ca309d3b28
Restart pihole-FTL after log flushing to force reloading history. Fixes #2339
6 years ago
DL6ER 0ebd68f17f
Review comments
6 years ago
Mark Drobnak 3696373609
Merge pull request #2345 from pi-hole/NXDOMAIN-tail
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
6 years ago
DL6ER f794018e0c
Acknowledge temporary file if disabled for "pihole -b" command
6 years ago
DL6ER 337cc5ca18
BLOCKING -> BLOCKING_ENABLED
6 years ago
DL6ER 4e4d6b5d1f
Adjust "pihole status" command
6 years ago
DL6ER b011adc453
Use new setupVars BLOCKING variable to determine which file to update via gravity
6 years ago
DL6ER d8abc1d266
Storing BLOCKING=true/false in setupVars.conf
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)
6 years ago
WaLLy3K d163e38380
Ensure regex-blocked lines are red
6 years ago
Realtbo d9195970b7 Create adlist file while running unattended setup
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.
6 years ago
DL6ER c00357663b
Reload pihole-FTL instead of restart the entire service on "pihole enable/disable"
6 years ago
Gusher123 2feb5f22cc
Signed-off-by
6 years ago
Gusher123 f3aee056ad Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1
6 years ago
Gusher123 91ff5ca0ca Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1
6 years ago
Gusher123 4238e36d7f Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1
6 years ago
Gusher123 03a9d3bc5b Not hardcoding dns and covering all blockingmodes
6 years ago
Gusher123 fe46dee194
Mode double brackets
6 years ago
Gusher123 1c6c35f861
Using double brackets
6 years ago
Gusher123 926b25fd54
Not hardcoding dns and covering all blockingmodes
6 years ago
Gusher123 e58142b4ac
Added comments
6 years ago
Gusher123 3e5c6afaee
Don't let one blocklist, block an other
6 years ago