552138e851
Appease stickler-bot.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-31 13:24:09 +10:00
ff71379a8e
Convert from two to four space indetation
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com >
2018-05-31 13:14:18 +10:00
23a7feeb6e
Merge pull request #2167 from pi-hole/uninstall_compat_check
...
flip uninstall compatability check
2018-05-30 22:13:21 -04:00
34f5db9ed4
Merge branch 'development' into uninstall_compat_check
...
# Conflicts:
# automated install/uninstall.sh
2018-05-30 22:08:20 -04:00
9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports
...
debug script: fix empty ports on some systems
2018-05-30 21:48:53 -04:00
87506852d1
Merge pull request #1761 from pi-hole/tweak/Uninstall
...
Tweak/uninstall
2018-05-30 21:19:59 -04:00
e6893bc419
Update uninstall.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-29 19:03:00 +10:00
ebeab06710
Appease Stickler-bot
...
So... originally no changes were made to the code, but Stickler-bot was unimpressed, so I've followed its suggestions.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-29 18:59:55 +10:00
1911c3690d
Style/Tabs to spaces
...
uninstall.sh contains a mix of tabs and spaces for indentation in different parts of the file.
Everywhere that used tabs has been converted to spaces, compatible with the indentation style used in basic_install.sh
No code has been altered, only the use of tabs and spaces in indention.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-29 17:59:39 +10:00
3f3254a4df
Merge pull request #2176 from rrobgill/php5fix
...
Fix block page crash on PHP 5.4
2018-05-22 23:21:20 -04:00
20ccb7b558
move & clarify comments
2018-05-21 08:16:53 +10:00
8cfe89604a
user-facing messages
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-17 07:44:07 +10:00
15f0ba839f
reload resloved
...
reload resolved config if possible, restart otherwise
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-16 07:35:22 +10:00
c400b914e5
Update basic-install.sh
...
Force reloading of relsolved config where available
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-16 07:28:32 +10:00
a431c829cb
Regex & case fix
...
grep & sed regexes match commented or uncommented
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-16 07:11:23 +10:00
25d0e125e5
relocate as function
...
The check for systemd-resolved DNSStubListener, and disabling as necessary is a new function, called just prior to start_service pihole-FTL.
The check for ubuntu bionic 18.04 specifically is removed.
The check if resolved is enabled is made with check_service_active()
An additional check that the dnsstublistener is enabled is made.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-15 20:23:36 +10:00
b89a78ce17
message text
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >>
2018-05-15 19:42:18 +10:00
f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale
...
Get user locale when debugging
2018-05-14 16:43:05 -04:00
328fb70e54
Merge pull request #2182 from RamSet/tweak/removeDoubleFound
...
Minor correction for double instance of the word "found".
2018-05-14 19:29:57 +01:00
2f24e5ceb7
Minor correction for double instance of the word "found".
...
Signed-off-by: RamSet <RamSet@gmail.com >
2018-05-14 12:21:20 -06:00
97809277df
Update uninstall.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >>
2018-05-14 19:50:58 +10:00
3d3e7a330c
restore resolvd.conf
...
If dnsmasq is removed, resolved will need to be restored.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-14 19:44:23 +10:00
adf2275018
unbind resolved on ubuntu 18.04
...
Stop systemd-resolved from interfering with dnsmasq/ftl
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-14 19:38:12 +10:00
c1ecfbfe63
linting: Double quote to prevent globbing and word splitting
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-05-12 19:39:17 -06:00
382c19024f
oh stickler bot...
...
accidentally a space
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-12 10:53:44 +10:00
9379487942
changes as requested
...
changes as requested
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-12 10:49:01 +10:00
5e99baf7b9
Update index.php
...
thanks stickler-ci .......
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-11 14:52:30 +10:00
31951dae4c
Update index.php
...
Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-05-11 14:31:42 +10:00
b1ab7f46e0
Merge pull request #2169 from pi-hole/tweak/customportsDNS
...
Remove LOCAL_DNS_PORT support
2018-05-10 22:25:29 +01:00
4e0c7ed5a6
Merge pull request #2163 from pi-hole/fix/supressDnsmasqWarning
...
Fix for an error message introduced in #2162
2018-05-07 20:44:39 +01:00
2ef76d5e31
Remove LOCAL_DNS_PORT support
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-05-04 22:19:39 +02:00
d3dda443cd
flip uninstall compatability check
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-05-04 00:02:47 -06:00
ec3802c180
add 'which' dependency (missing on Fedora minimal)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-05-03 23:41:42 -06:00
76654c7856
Actually check for dnsmasq's existence before attempting to interact with it's service
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-05-03 21:16:31 +01:00
90239bb969
Merge pull request #2162 from pi-hole/fix/ifFtlExists
...
Don't attempt to download non-existent FTL Binary
2018-05-03 11:07:12 +01:00
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
...
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing
Signed-off-by: Adam Warner <adamw@rner.email >
2018-05-01 23:15:26 +01:00
8ad37af70e
CentOS install re-worked to include PHP7 via Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-05-01 00:58:21 -06:00
c102d359f8
Merge pull request #2159 from pi-hole/tweak/removeDnsmasqRefs
...
Tweak/remove dnsmasq refs
2018-04-30 19:26:59 -04:00
a07891e3e6
0 is not 1!!
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-30 23:53:51 +01:00
e946a35b18
Move dnsmasq check into FTLcheckUpdate
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-30 23:50:35 +01:00
68d7337f98
switch up dnsmasq detection logic
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-30 23:42:41 +01:00
8b4198fd8d
Merge pull request #1835 from Fauxsys/development
...
Fix for unattended installations #1767 #1768 #1834
2018-04-30 23:06:46 +01:00
9c795fa40d
Merge pull request #2157 from pi-hole/fix/EmptyAdlist
...
Allow for empty/non existent adlist file
2018-04-30 22:02:34 +01:00
5f2217a079
Fix for gravity.list not being emptied with an empty/missing adlist file.
...
Variable output depending on content of /existence of adlist
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-30 21:56:33 +01:00
0cda4b7f23
Merge pull request #2123 from pi-hole/new/RemoveDefaultBlocklists
...
Remove default blocklists from install
2018-04-29 22:06:47 +01:00
e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists
2018-04-29 18:40:53 +01:00
e1bf4d4344
Merge pull request #2155 from pi-hole/tweak/DontStopServices
...
No need to stop services
2018-04-29 18:38:34 +01:00
0c8a32b9ae
No need to stop services
...
This causes issues on a `pihole -r reconfigure`
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-29 18:27:10 +01:00
d8c60aaae7
Merge pull request #2142 from bcambl/fix_fedora_ip_check
...
Fix static IP checking on Fedora
2018-04-29 14:36:07 +01:00
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists
2018-04-29 13:39:17 +01:00
