Dan Schaper
72829be281
Remove shellcheck overrides
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Adam Warner
d57f9906bd
read -r -a, not read -a -r
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
3d4fea6510
Move -r to before the -p
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
f670644954
Revert "lighttpd conf enhancements"
6 years ago
bcambl
3ec84553ef
fix debug service check via sysvinit
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Mark Drobnak
a301d4381f
Merge pull request #2472 from pi-hole/fix-webpwexpansion
...
Prevent BASH from expanding Web Password
6 years ago
Mark Drobnak
49b8ad7e94
Merge pull request #2470 from jeremysherriff/patch-1
...
Silence updateGravity cron job unless errors occur
6 years ago
WaLLy3K
180d29c7b3
Prevent BASH from expanding Web Password
...
* Resolves issue #2471
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
6 years ago
Mark Drobnak
a23ba91681
Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements
...
lighttpd conf enhancements
6 years ago
jeremysherriff
d3ac8bb6f8
Silence updateGravity job unless errors occur
...
No need for append/logrotate as we are only interested in the latest output
Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>
6 years ago
Mark Drobnak
f87f3b9199
Merge pull request #2467 from pi-hole/fix/dnsmasq-license
...
Update dnsmasq config license
6 years ago
Glenn Strauss
67bdcbcf19
lighttpd: slightly more efficient sample config
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
6 years ago
Glenn Strauss
69b2a5a876
lighttpd: use file glob for optional external.conf
...
lighttpd 1.4.50 config parse will error if include_shell exits non-zero
and pi-hole sample config: include_shell "cat external.conf 2>/dev/null"
is an error if external.conf does not exist
Replace with: include "external*.conf"
file glob supported since lighttpd 1.4.40 and is not an error if there
is no file which matches the file glob
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
6 years ago
WaLLy3K
7f92671765
Update dnsmasq config license
...
* Also updated "separate config" text
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
6 years ago
Mark Drobnak
85dceb12a1
Use curl -s instead of -q
...
See #2416
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
6 years ago
Mcat12
d55012f724
Append versions (after the first) instead of overwriting in updatecheck
...
Fixes an issue brought up in #2435
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
7c6eecc9c8
Ignore shellcheck warning
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
e4cbf5023a
Fix error when reading in new password
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
46356d3027
Merge pull request #2434 from pi-hole/fix/2200
...
Only check web versions if web interface is installed
6 years ago
Mark Drobnak
958a263437
Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template
...
Improve pihole-FTL.conf template
6 years ago
Mark Drobnak
a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all
...
Fix invalid numbers in Chronometer
6 years ago
Mark Drobnak
cedc39bf09
Merge pull request #2426 from mrmajik45/master
...
Read without -r will mangle backslashes. (Fix)
6 years ago
Adam Warner
0627e68078
Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this.
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
7d78f6314a
Source Setupvars file and only check local/remote Web branch/version if the web interface is installed.
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
mrmajik45
0f509f4a34
Update piholeDebug.sh
6 years ago
DL6ER
b043000044
Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
c338eab3c6
According to the PHP documentation, PHP 7.0.0+ does not longer recognize hash marks (#) as comments. As FTL has been trained to understand PHP-style (comment lines start with ";") as well, we switch to using them.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
WaLLy3K
24e1dc92ba
Resolve issue #2428
...
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
6 years ago
mrmajik45
00f98543ad
read without -r will mangle backslashes.
6 years ago
mrmajik45
8684356b44
read without -r will mangle backslashes.
6 years ago
Mark Drobnak
dac27f1f18
Only get the first gateway for chronometer
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
6 years ago
Mark Drobnak
6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
...
Use ip route rather than old net-tools route in chronometer.sh
6 years ago
Mark Drobnak
ec29829550
Merge pull request #2388 from Sh4d1/ipv6_brackets
...
Remove external Ipv6 brackets in servername if any
6 years ago
DL6ER
40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
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
Patrik Cyvoct
85cf98888d
Merge remote-tracking branch 'origin/development' into ipv6_brackets
...
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
6 years ago
Patrik Cyvoct
048e5bb9a2
Remove external ipv6 brackets if any in servername
...
Signed-off-by: Patrik Cyvoct <patrik@ptrk.io>
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
940c9c3bae
Merge pull request #2383 from pi-hole/feature/privacy-level-4
...
Add support for privacy level 4
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
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
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
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
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
WaLLy3K
eef948d797
Fix header newlines
...
* Added \\n to each $xxx_ver_str, resolving issue #2325
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
6 years ago
Mcat12
e4e22fb58e
Fix permissive regex
...
The `\.?` is too permissive, letting in anything that ends in the domain
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
7086a400e8
Use simpler regex format for wildcards
...
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
af2ec61965
Convert [] to ()
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
94b7c8eb59
Added header for file. Not using standard Pi-hole copyright header.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
f2c675cff6
Formatted pihole-FTL.conf for readability.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
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>
6 years ago
Adam Warner
9b1356ad01
Revert #2282
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Peter Robinson
45521b377a
Use ip route rather than old net-tools route in chronometer.sh
...
The only use of net-tools is the use of route in chronometer.sh so
instead use the same method as used in piholeDebug.sh to get the
default gateway so there's no need to depend on net-tools anylonger.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
6 years ago
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development
...
# Conflicts:
# advanced/Scripts/piholeDebug.sh
6 years ago
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
c5091b0e49
Space/Tab wildcard_regex_converter.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
b54e32f0ca
Space/Tab webpage.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
328e7738d5
Space/Tab version.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
aca359c2e2
Space/Tab updatecheck.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
1cd40dc9e5
Space/Tab update.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
dc9407281f
Space/Tab setupLCD.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
8f727c1f35
Space/Tab query.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
a08ea28feb
Space/Tab piholeLogFlush.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
c5535dd9a0
Space/Tab piholeCheckout.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
3519cc5e44
Space/Tab list.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
d251bbbb05
Space/Tab chronometer.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
76c5b4a06b
Merge pull request #2118 from pi-hole/fix/debug-shellcheck
...
fix some shellcheck/stickler compaints in debug script
6 years ago
RamSet
56b04017e7
Port 53 check updated with 4 spaces.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
Dan Schaper
f42a57088f
Merge pull request #2280 from rrobgill/development
...
Add regex option to autocomplete
6 years ago
Rob Gill
c5b9d99b48
Add regex option to autocomplete
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mcat12
f8d4c36f6d
Add back --wild list.sh help and use -- for long params like --regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
...
Use regex lists instead of wildcards for blocking
6 years ago
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
1b276a74fe
Display all lines of a list, even if there is no newline at the end
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
8084c4b2a3
Fix regex period substitution due to switching to bashism
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
1ca852191f
Fix stickler complaints
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
af5fc6547a
Fix echoing wrong domain when converting wildcard
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
70f2b26c86
Escape periods in wildcard converted regex filters.
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
cfd95dbe87
Fix incorrect variable usage
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
d21298c156
Add back conditional forwarding to webpage.sh
...
This was accidentally removed in a previous PR.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
4763969c8f
Move processWildcards to query.sh
...
Closes #2255
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
f868052062
Fix incorrect variable string substitution
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists
6 years ago
Mcat12
3077c22e4f
Change help strings from wildcard to regex blacklist
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
0decc37b5a
Appease stickler
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
4a953b66e0
Make removing regex domains work correctly
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
8435eeed4d
Don't validate regex domains
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
cffb4de83b
Use strict grep instead of regex for duplicates
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
868948509a
Split declaration and assignment of random_url
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
e71492a2b3
Update debug script for simple list format
...
Gravity is now just a list of domains, not IP addresses and domains separated by a space.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
DL6ER
2809579dd7
Refine regex filter generation
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
c7afe3e9a4
Please stickler by making clear that the variable regexFile is declared outside of this routine
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
cd026cd865
Add comment where regexList is defined
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
bc705aac03
Add automated wildcard list -> regex filter conversion
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Rob Gill
23adbf9540
remove quotes
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago