Mark Drobnak
a23ba91681
Merge pull request #2468 from gstrauss/lighttpd-conf-enhancements
...
lighttpd conf enhancements
2018-10-20 16:43:03 -04:00
Mark Drobnak
f87f3b9199
Merge pull request #2467 from pi-hole/fix/dnsmasq-license
...
Update dnsmasq config license
2018-10-17 11:56:41 -04:00
Glenn Strauss
67bdcbcf19
lighttpd: slightly more efficient sample config
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2018-10-17 06:54:54 -04:00
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>
2018-10-17 06:54:43 -04:00
Mark Drobnak
a79dff3d98
Merge pull request #2466 from pi-hole/readme-newcoverage
...
Update coverage links
2018-10-16 22:42:34 -04:00
Dan Schaper
c859a23136
Merge pull request #2462 from pi-hole/fix/updatecheck-curl-silent
...
Use curl -s instead of -q
2018-10-16 18:46:45 -07:00
WaLLy3K
7f92671765
Update dnsmasq config license
...
* Also updated "separate config" text
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-10-17 11:01:28 +11:00
WaLLy3K
ec38105b08
Update coverage links
...
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-10-17 10:46:56 +11:00
Mark Drobnak
85dceb12a1
Use curl -s instead of -q
...
See #2416
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-10-12 23:53:21 -04:00
Mark Drobnak
5126c37c1e
Merge pull request #2460 from bcambl/fix_create_pihole_user
...
fix pihole user creation function
2018-10-12 22:47:56 -04:00
bcambl
e7e03e36de
fix pihole user creation function
...
- fix stdout newlines
- catch failed user creation
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-10-12 11:05:44 -06:00
Mark Drobnak
13c393fc9d
Merge pull request #2451 from pi-hole/fix/2450
...
fix for #2450
2018-10-07 21:02:39 -04:00
Adam Warner
cc2f375b13
fix for #2450
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-10-07 11:51:36 +01:00
Mark Drobnak
49d5109c96
Merge pull request #2446 from AndreasElia/development
...
Readme grammar fixes
2018-10-02 21:59:35 -04:00
Andreas Elia
e5c8f5e2fa
Readme grammar fixes
...
Signed-off-by: Andreas Elia <andreaselia@live.co.uk>
2018-10-02 17:43:13 +01:00
Mark Drobnak
ff925a7578
Merge pull request #2437 from pi-hole/fix/version-files-overwritten
...
Append versions (after the first) instead of overwriting in updatecheck
2018-10-01 11:21:29 -04:00
Mark Drobnak
33939a30ea
Merge pull request #2347 from Gusher123/patch-1
...
Don't let one blocklist block an other blocklist
2018-09-30 21:24:45 -04:00
Mark Drobnak
308b296285
Merge pull request #2401 from pi-hole/fix/checkout-readonly
...
Fix checkout error due to readonly variable
2018-09-30 21:05:11 -04:00
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>
2018-09-30 20:56:44 -04:00
Mark Drobnak
46356d3027
Merge pull request #2434 from pi-hole/fix/2200
...
Only check web versions if web interface is installed
2018-09-30 17:57:54 -04:00
Mark Drobnak
958a263437
Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template
...
Improve pihole-FTL.conf template
2018-09-30 17:24:36 -04:00
Mark Drobnak
a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all
...
Fix invalid numbers in Chronometer
2018-09-30 17:23:06 -04:00
Mark Drobnak
cedc39bf09
Merge pull request #2426 from mrmajik45/master
...
Read without -r will mangle backslashes. (Fix)
2018-09-30 17:19:56 -04:00
Adam Warner
0131055ec9
Submission stale, addressing @mcat12's comments
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-09-30 20:00:06 +01:00
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>
2018-09-30 19:45:04 +01:00
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>
2018-09-30 19:41:04 +01:00
mrmajik45
0f509f4a34
Update piholeDebug.sh
2018-09-28 17:22:31 -04:00
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>
2018-09-28 12:08:39 +02:00
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>
2018-09-28 11:11:30 +02:00
WaLLy3K
24e1dc92ba
Resolve issue #2428
...
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-09-28 10:34:49 +10:00
mrmajik45
00f98543ad
read without -r will mangle backslashes.
2018-09-26 10:32:22 -04:00
mrmajik45
8684356b44
read without -r will mangle backslashes.
2018-09-26 10:31:44 -04:00
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
2018-09-10 17:52:09 -04:00
Stuart Skelton
3c36c22ca8
Remove Norton Connect Safe as its EOL 2018-11-15
...
Signed-off-by: Stuart Skelton <stuarts@broadbean.com>
2018-09-10 22:37:45 +01:00
Mark Drobnak
7a2f5f43f9
Merge pull request #2408 from pi-hole/fix/2299
...
Only get the first gateway for chronometer
2018-09-09 16:38:05 -04:00
Mark Drobnak
dac27f1f18
Only get the first gateway for chronometer
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-09-09 15:12:48 -04:00
Mark Drobnak
6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
...
Use ip route rather than old net-tools route in chronometer.sh
2018-09-09 15:11:19 -04:00
Mark Drobnak
537e288758
Merge pull request #2407 from pi-hole/fix/lighttpd-external-conf
...
Fix lighttpd v1.4.50 crashing on startup
2018-09-07 12:55:21 -04:00
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>
2018-09-07 12:09:37 -04:00
Mark Drobnak
c976bbcfd2
Fix checkout error due to readonly variable
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-09-01 22:11:45 -04:00
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
Mark Drobnak
cf7180af5b
Merge pull request #2398 from pi-hole/rpm_distro_checks
...
WIP: Update RPM distro checks
2018-08-31 12:54:55 -04:00
bcambl
c58e3acc78
add unsupported RPM distro warnings
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-08-31 10:04:52 -06:00
DL6ER
b78aef1e7e
Merge pull request #2356 from pi-hole/tweak/reload_on_enable_disable
...
Change the enable/disable method
2018-08-30 22:37:57 +02:00
DL6ER
f20e4ddf3b
Change message for unknown state to something more useful
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-30 22:28:15 +02:00
DL6ER
40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
2018-08-30 22:26:57 +02:00
bcambl
6f8e8e98bb
update centos version check test
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-08-29 22:16:11 -06:00
bcambl
24b4aabae9
allow installer to continue with additional rpm based distros
...
- FedBerry (Fedora based ARM image)
- Scientific Linux (CentOS based)
- Add prompt to continue installing on unsupported RPM based distros
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-08-29 20:49:06 -06:00
Mark Drobnak
a9c6d79cda
Merge pull request #2394 from pi-hole/fix/pihole-FTL_owner_group
...
Ensure proper unprivileged user if pihole-FTL is started as root
2018-08-29 11:17:39 -04: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