0131055ec9
Submission stale, addressing @mcat12's comments
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-09-30 20:00:06 +01:00
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
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
0f509f4a34
Update piholeDebug.sh
2018-09-28 17:22:31 -04:00
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
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
24e1dc92ba
Resolve issue #2428
...
Signed-off-by: WaLLy3K <wally3k@pi-hole.net >
2018-09-28 10:34:49 +10:00
00f98543ad
read without -r will mangle backslashes.
2018-09-26 10:32:22 -04:00
8684356b44
read without -r will mangle backslashes.
2018-09-26 10:31:44 -04:00
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
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
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
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
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
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
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
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
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
cf7180af5b
Merge pull request #2398 from pi-hole/rpm_distro_checks
...
WIP: Update RPM distro checks
2018-08-31 12:54:55 -04:00
c58e3acc78
add unsupported RPM distro warnings
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-08-31 10:04:52 -06:00
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
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
40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
2018-08-30 22:26:57 +02:00
6f8e8e98bb
update centos version check test
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-08-29 22:16:11 -06:00
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
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
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
667c5138cc
Merge pull request #2381 from pi-hole/fix/existing_dnsmasq.conf
...
Improve /etc/dnsmasq.conf handling
2018-08-25 18:55:12 -05:00
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
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
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
1813c25117
If config file was backed up: Print info message
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-21 13:07:23 +02:00
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
5d0d7336ff
Echo with newline when setting privacy level
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 20:21:03 -04:00
6a26a05dbf
Fix privacy level whiptail option format
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 19:40:43 -04:00
c22e94c9c7
Update test to include empty FTL config
...
The installer ensures that an FTL config will exist, and creates an
empty file if it doesn't.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 19:33:15 -04:00
4aafa8cf47
Set the FTL privacy level during install
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 19:20:29 -04:00
9235a11d5f
Merge pull request #2382 from pi-hole/tweak/no-extra-logging
...
Don't use extra query logging
2018-08-20 18:33:42 -04:00
f141b9f778
Add support for privacy level 4
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 17:36:16 -04:00
1dca1efbc6
Don't use extra query logging
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-20 23:11:23 +02:00
28c6b1393f
Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-20 22:52:22 +02:00
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
ec2426b24d
Add clarifying comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-19 19:55:47 +02:00
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
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
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
0d1b3cee4f
Enable FTL service before starting it
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it >
2018-08-16 17:52:47 +02:00
0b44cb4426
Merge branch 'development' of https://github.com/pi-hole/pi-hole into development
2018-08-16 17:48:35 +02:00
eb8e4496b2
Merge pull request #2354 from realtebo/development
...
Create adlist file while running unattended setup
2018-08-16 11:26:07 -04:00
30f45d4df7
Merge branch 'development' of https://github.com/pi-hole/pi-hole into development
2018-08-16 16:52:18 +02:00
