Commit graph

5868 commits

Author SHA1 Message Date
DL6ER
6c97b8b875
Merge pull request #2377 from pi-hole/fix/service-touch-leases
Touch dhcp.leases to ensure it exists
2018-08-20 11:24:44 +02:00
DL6ER
ec2426b24d
Add clarifying comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-19 19:55:47 +02:00
DL6ER
5cd3b11391
Start pihole-FTL as root if capabilities are not supported by the system
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-19 14:32:19 +02:00
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>
2018-08-19 13:53:34 +02:00
Mark Drobnak
74008d28a7
Merge pull request #2367 from realtebo/fix-enabling-ftl
Fix to enable pihole-FTL service before starting it
2018-08-16 16:15:46 -04:00
Realtebo
0d1b3cee4f Enable FTL service before starting it
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-16 17:52:47 +02:00
Realtebo
0b44cb4426 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development 2018-08-16 17:48:35 +02:00
Mark Drobnak
eb8e4496b2
Merge pull request #2354 from realtebo/development
Create adlist file while running unattended setup
2018-08-16 11:26:07 -04:00
Realtebo
30f45d4df7 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development 2018-08-16 16:52:18 +02:00
Mark Drobnak
24e1c78d52
Merge pull request #2358 from pi-hole/fix/restart_FTl_on_logflush
Restart pihole-FTL after log flushing
2018-08-16 10:34:25 -04:00
Mirko Tebaldi
476fecbcf5 Fixed typos as suggestes
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-14 15:04:42 +02:00
Mirko Tebaldi
327b58fa03
Merge pull request #1 from pi-hole/development
Merge with current main development branch
2018-08-14 14:55:18 +02:00
DL6ER
d3eea9404d
Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg
Improve error message when downloading FTL failed
2018-08-14 13:20:47 +02:00
DL6ER
ca309d3b28
Restart pihole-FTL after log flushing to force reloading history. Fixes #2339
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-14 13:16:17 +02:00
DL6ER
0ebd68f17f
Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-14 09:55:16 +02:00
Mark Drobnak
3696373609
Merge pull request #2345 from pi-hole/NXDOMAIN-tail
Fix colour tail for use with new blocking methods
2018-08-13 15:01:35 -04:00
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>
2018-08-13 18:53:31 +02:00
DL6ER
f794018e0c
Acknowledge temporary file if disabled for "pihole -b" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 18:17:14 +02:00
DL6ER
337cc5ca18
BLOCKING -> BLOCKING_ENABLED
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 17:22:10 +02:00
DL6ER
4e4d6b5d1f
Adjust "pihole status" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 15:02:00 +02:00
DL6ER
b011adc453
Use new setupVars BLOCKING variable to determine which file to update via gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 14:19:59 +02:00
DL6ER
d8abc1d266
Storing BLOCKING=true/false in setupVars.conf
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 13:49:47 +02:00
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>
2018-08-13 13:43:14 +02:00
WaLLy3K
d163e38380
Ensure regex-blocked lines are red
* Add `regex.list` to seds list

Signed-off-by: WaLLy3K <wally3k@pihole.net>
2018-08-13 14:56:38 +10:00
Realtbo
d9195970b7 Create adlist file while running unattended setup
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-12 23:21:01 +02:00
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>
2018-08-12 19:31:00 +02:00
DL6ER
c00357663b
Reload pihole-FTL instead of restart the entire service on "pihole enable/disable"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-12 19:17:20 +02:00
Gusher123
2feb5f22cc
Signed-off-by
This is my commit message

Signed-off-by: Gusher123 <t.siebeling@gmail.com>
2018-08-12 10:05:58 +02:00
Gusher123
f3aee056ad Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1 2018-08-12 09:59:34 +02:00
Gusher123
91ff5ca0ca Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1
Signed-off-by: Gusher123 <t.siebeling@gmail.com>
2018-08-12 09:58:45 +02:00
Gusher123
4238e36d7f Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1 2018-08-12 03:07:07 +02:00
Gusher123
03a9d3bc5b Not hardcoding dns and covering all blockingmodes
Using double brackets

Mode double brackets
2018-08-12 03:05:53 +02:00
Gusher123
fe46dee194
Mode double brackets 2018-08-12 02:06:32 +02:00
Gusher123
1c6c35f861
Using double brackets 2018-08-12 01:50:23 +02:00
Gusher123
926b25fd54
Not hardcoding dns and covering all blockingmodes 2018-08-12 01:15:42 +02:00
Gusher123
e58142b4ac
Added comments 2018-08-11 15:14:45 +02:00
Gusher123
3e5c6afaee
Don't let one blocklist, block an other
If a blocklist is blocked by an other and 'pihole -g' is run, update the blocked blocklist by useing an alternate dns server (in this case 1.1.1.1) to acquire the IP adres and download the blocklist using the 'curl --resolve' (https://curl.haxx.se/docs/manpage.html#--resolve)
2018-08-11 14:33:33 +02:00
WaLLy3K
a1bf9fad98
Fix colour tail for use with new blocking methods
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-08-11 12:55:18 +10:00
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
2018-08-10 18:06:23 -04:00
DL6ER
94e4ed6644
Add facility to add multiple audit list entries at once and to nuke audit list
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-10 18:22:55 +02:00
Mark Drobnak
ef8aaba014
Merge pull request #2320 from TronPaul/fix/no-tty
set noninteractive during unattended install
2018-08-08 19:28:12 -04:00
Mark Drobnak
d2ae07e69b
Merge pull request #2334 from pi-hole/fix/gravity-count-regex
Fix gravity's regex counting logic
2018-08-08 16:22:50 -04:00
DL6ER
760dd01b50
Use grep invert-match
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-07 18:36:06 +02:00
DL6ER
5bf90cb77d
Use alternative logic for counting regex file entries, skipping commented out lines
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-07 18:02:01 +02:00
DL6ER
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-07 16:51:58 +02:00
DL6ER
f2b820079a
Merge pull request #2329 from pi-hole/tweak/remove-ppc
Remove PowerPC from FTL binaries
2018-08-07 16:02:11 +02:00
WaLLy3K
083024496a
Merge pull request #2327 from pi-hole/header-fix
Fix Chronometer heading
2018-08-07 12:29:45 +10:00
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>
2018-08-06 21:15:16 -04:00
WaLLy3K
eef948d797
Fix header newlines
* Added \\n to each $xxx_ver_str, resolving issue #2325

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-08-07 10:45:30 +10:00
DL6ER
8017be7d09
Merge pull request #2322 from pi-hole/release/v4.0
Git Flow - Release/v4.0 merge back to development.
2018-08-06 09:57:28 +02:00