Mark Drobnak
a23ba91681
Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements
...
lighttpd conf enhancements
6 years ago
jeremysherriff
d986da63a5
Pass gravity exit code back to caller to allow for cron error handling
...
Signed-off-by: jeremysherriff <jeremysherriff@gmail.com>
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
Mark Drobnak
a79dff3d98
Merge pull request #2466 from pi-hole/readme-newcoverage
...
Update coverage links
6 years ago
Dan Schaper
c859a23136
Merge pull request #2462 from pi-hole/fix/updatecheck-curl-silent
...
Use curl -s instead of -q
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
WaLLy3K
ec38105b08
Update coverage links
...
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
Mark Drobnak
5126c37c1e
Merge pull request #2460 from bcambl/fix_create_pihole_user
...
fix pihole user creation function
6 years ago
bcambl
e7e03e36de
fix pihole user creation function
...
- fix stdout newlines
- catch failed user creation
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Mark Drobnak
13c393fc9d
Merge pull request #2451 from pi-hole/fix/2450
...
fix for #2450
6 years ago
Adam Warner
cc2f375b13
fix for #2450
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Mark Drobnak
49d5109c96
Merge pull request #2446 from AndreasElia/development
...
Readme grammar fixes
6 years ago
Andreas Elia
e5c8f5e2fa
Readme grammar fixes
...
Signed-off-by: Andreas Elia <andreaselia@live.co.uk>
6 years ago
Mark Drobnak
ff925a7578
Merge pull request #2437 from pi-hole/fix/version-files-overwritten
...
Append versions (after the first) instead of overwriting in updatecheck
6 years ago
Mark Drobnak
33939a30ea
Merge pull request #2347 from Gusher123/patch-1
...
Don't let one blocklist block an other blocklist
6 years ago
Mark Drobnak
308b296285
Merge pull request #2401 from pi-hole/fix/checkout-readonly
...
Fix checkout error due to readonly variable
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
0131055ec9
Submission stale, addressing @mcat12's comments
...
Signed-off-by: Adam Warner <adamw@rner.email>
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
a89615365e
Merge pull request #2410 from stuartskelton/norton_dns_EOL_2018_11_15
...
Remove Norton Connect Safe as its EOL 2018-11-15
6 years ago
Stuart Skelton
3c36c22ca8
Remove Norton Connect Safe as its EOL 2018-11-15
...
Signed-off-by: Stuart Skelton <stuarts@broadbean.com>
6 years ago
Mark Drobnak
7a2f5f43f9
Merge pull request #2408 from pi-hole/fix/2299
...
Only get the first gateway for chronometer
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
537e288758
Merge pull request #2407 from pi-hole/fix/lighttpd-external-conf
...
Fix lighttpd v1.4.50 crashing on startup
6 years ago
Mark Drobnak
3cea1bd423
Fix lighttpd v1.4.50 crashing on startup
...
It has a bug/regression causing it to fail if external.conf does not exist,
so touch external.conf when installing lighttpd config
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
6 years ago
Mark Drobnak
c976bbcfd2
Fix checkout error due to readonly variable
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
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
Mark Drobnak
cf7180af5b
Merge pull request #2398 from pi-hole/rpm_distro_checks
...
WIP: Update RPM distro checks
6 years ago
bcambl
c58e3acc78
add unsupported RPM distro warnings
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
DL6ER
b78aef1e7e
Merge pull request #2356 from pi-hole/tweak/reload_on_enable_disable
...
Change the enable/disable method
6 years ago
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