Mark Drobnak
|
ec29829550
|
Merge pull request #2388 from Sh4d1/ipv6_brackets
Remove external Ipv6 brackets in servername if any
|
2018-09-01 19:44:29 -04:00 |
|
DL6ER
|
40656641b6
|
Merge branch 'development' into tweak/reload_on_enable_disable
|
2018-08-30 22:26:57 +02:00 |
|
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>
|
2018-08-27 16:51:33 +02:00 |
|
Patrik Cyvoct
|
85cf98888d
|
Merge remote-tracking branch 'origin/development' into ipv6_brackets
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
|
2018-08-22 09:31:54 +02:00 |
|
Patrik Cyvoct
|
048e5bb9a2
|
Remove external ipv6 brackets if any in servername
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
|
2018-08-22 09:11:55 +02:00 |
|
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
|
2018-08-21 14:11:24 +02:00 |
|
DL6ER
|
940c9c3bae
|
Merge pull request #2383 from pi-hole/feature/privacy-level-4
Add support for privacy level 4
|
2018-08-21 13:03:41 +02:00 |
|
Mcat12
|
f141b9f778
|
Add support for privacy level 4
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-08-20 17:36:16 -04:00 |
|
DL6ER
|
1dca1efbc6
|
Don't use extra query logging
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2018-08-20 23:11:23 +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 |
|
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
|
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
|
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 |
|
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 |
|
Mcat12
|
e4e22fb58e
|
Fix permissive regex
The `\.?` is too permissive, letting in anything that ends in the domain
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-31 22:16:40 -04:00 |
|
Mcat12
|
7086a400e8
|
Use simpler regex format for wildcards
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-31 21:36:29 -04:00 |
|
Dan Schaper
|
af2ec61965
|
Convert [] to ()
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-29 08:17:57 -07:00 |
|
Dan Schaper
|
94b7c8eb59
|
Added header for file. Not using standard Pi-hole copyright header.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-28 19:58:23 -07:00 |
|
Dan Schaper
|
f2c675cff6
|
Formatted pihole-FTL.conf for readability.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-28 16:16:16 -07:00 |
|
Dan Schaper
|
b79ff05e29
|
Move template files to own subdir. Include pihole-FTL.conf in templates.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-27 15:21:25 -07:00 |
|
Adam Warner
|
9b1356ad01
|
Revert #2282
Signed-off-by: Adam Warner <adamw@rner.email>
|
2018-07-27 00:27:06 +01:00 |
|
Mcat12
|
03e5a78d8f
|
Merge remote-tracking branch 'origin/FTLDNS' into development
# Conflicts:
# advanced/Scripts/piholeDebug.sh
|
2018-07-22 15:18:26 -04:00 |
|
Dan Schaper
|
ba7782f867
|
Space/Tab piholeDebug.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 15:25:35 -07:00 |
|
Dan Schaper
|
c5091b0e49
|
Space/Tab wildcard_regex_converter.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 14:00:34 -07:00 |
|
Dan Schaper
|
b54e32f0ca
|
Space/Tab webpage.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 13:57:15 -07:00 |
|
Dan Schaper
|
328e7738d5
|
Space/Tab version.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 13:27:30 -07:00 |
|
Dan Schaper
|
aca359c2e2
|
Space/Tab updatecheck.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 13:24:05 -07:00 |
|
Dan Schaper
|
1cd40dc9e5
|
Space/Tab update.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 13:22:37 -07:00 |
|
Dan Schaper
|
dc9407281f
|
Space/Tab setupLCD.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 13:17:10 -07:00 |
|
Dan Schaper
|
8f727c1f35
|
Space/Tab query.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 13:13:42 -07:00 |
|
Dan Schaper
|
a08ea28feb
|
Space/Tab piholeLogFlush.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 13:07:54 -07:00 |
|
Dan Schaper
|
c5535dd9a0
|
Space/Tab piholeCheckout.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 12:54:24 -07:00 |
|
Dan Schaper
|
3519cc5e44
|
Space/Tab list.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 12:42:11 -07:00 |
|
Dan Schaper
|
d251bbbb05
|
Space/Tab chronometer.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2018-07-20 12:29:09 -07:00 |
|
Dan Schaper
|
76c5b4a06b
|
Merge pull request #2118 from pi-hole/fix/debug-shellcheck
fix some shellcheck/stickler compaints in debug script
|
2018-07-19 05:18:40 -07:00 |
|
RamSet
|
56b04017e7
|
Port 53 check updated with 4 spaces.
Signed-off-by: RamSet <RamSet@gmail.com>
|
2018-07-16 11:29:12 -06:00 |
|
Dan Schaper
|
f42a57088f
|
Merge pull request #2280 from rrobgill/development
Add regex option to autocomplete
|
2018-07-16 09:34:22 -07:00 |
|
Rob Gill
|
c5b9d99b48
|
Add regex option to autocomplete
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
|
2018-07-16 10:50:05 +10:00 |
|
Mcat12
|
f8d4c36f6d
|
Add back --wild list.sh help and use -- for long params like --regex
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-15 18:59:25 -04:00 |
|
Dan Schaper
|
dbc82cfb6a
|
Merge pull request #2236 from pi-hole/new/regex-lists
Use regex lists instead of wildcards for blocking
|
2018-07-14 06:10:44 -07:00 |
|
Mcat12
|
941a766aa3
|
Replace -wild and -regex with --wild and --regex
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-12 21:38:43 -04:00 |
|
Mcat12
|
1b276a74fe
|
Display all lines of a list, even if there is no newline at the end
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-08 16:03:16 -04:00 |
|
Mcat12
|
8084c4b2a3
|
Fix regex period substitution due to switching to bashism
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-08 15:56:15 -04:00 |
|
Mcat12
|
1ca852191f
|
Fix stickler complaints
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-08 15:50:05 -04:00 |
|
Mcat12
|
af5fc6547a
|
Fix echoing wrong domain when converting wildcard
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-08 15:47:18 -04:00 |
|
Mcat12
|
70f2b26c86
|
Escape periods in wildcard converted regex filters.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-08 15:45:06 -04:00 |
|
Mcat12
|
cfd95dbe87
|
Fix incorrect variable usage
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
|
2018-07-08 15:38:44 -04:00 |
|