Commit graph

5840 commits

Author SHA1 Message Date
Rob Gill
20ccb7b558
move & clarify comments 2018-05-21 08:16:53 +10:00
Rob Gill
8cfe89604a
user-facing messages
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-17 07:44:07 +10:00
Rob Gill
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
Rob Gill
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
Rob Gill
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
Rob Gill
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
Rob Gill
b89a78ce17
message text
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
2018-05-15 19:42:18 +10:00
Mark Drobnak
f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale
Get user locale when debugging
2018-05-14 16:43:05 -04:00
Adam Warner
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
RamSet
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
Rob Gill
97809277df
Update uninstall.sh
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
2018-05-14 19:50:58 +10:00
Rob Gill
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
Rob Gill
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
bcambl
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
Adam Warner
a7e7680789
Merge pull request #2158 from pi-hole/development
Update FTLDNS from dev
2018-05-12 23:17:43 +01:00
Rob Gill
382c19024f
oh stickler bot...
accidentally a space

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-12 10:53:44 +10:00
Rob Gill
9379487942
changes as requested
changes as requested 

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-12 10:49:01 +10:00
Rob Gill
5e99baf7b9
Update index.php
thanks stickler-ci  .......

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-11 14:52:30 +10:00
Rob Gill
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
Adam Warner
b1ab7f46e0
Merge pull request #2169 from pi-hole/tweak/customportsDNS
Remove LOCAL_DNS_PORT support
2018-05-10 22:25:29 +01:00
Adam Warner
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
DL6ER
2ef76d5e31
Remove LOCAL_DNS_PORT support
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-05-04 22:19:39 +02:00
bcambl
d3dda443cd flip uninstall compatability check
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-04 00:02:47 -06:00
bcambl
ec3802c180 add 'which' dependency (missing on Fedora minimal)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-03 23:41:42 -06:00
Adam Warner
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
Adam Warner
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
Adam Warner
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
bcambl
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
Mark Drobnak
c102d359f8
Merge pull request #2159 from pi-hole/tweak/removeDnsmasqRefs
Tweak/remove dnsmasq refs
2018-04-30 19:26:59 -04:00
Adam Warner
a07891e3e6
0 is not 1!!
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:53:51 +01:00
Adam Warner
e946a35b18
Move dnsmasq check into FTLcheckUpdate
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:50:35 +01:00
Adam Warner
68d7337f98
switch up dnsmasq detection logic
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:42:41 +01:00
Adam Warner
8b4198fd8d
Merge pull request #1835 from Fauxsys/development
Fix for unattended installations #1767 #1768 #1834
2018-04-30 23:06:46 +01:00
Adam Warner
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
Adam Warner
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
Adam Warner
0cda4b7f23
Merge pull request #2123 from pi-hole/new/RemoveDefaultBlocklists
Remove default blocklists from install
2018-04-29 22:06:47 +01:00
Adam Warner
e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists 2018-04-29 18:40:53 +01:00
Adam Warner
e1bf4d4344
Merge pull request #2155 from pi-hole/tweak/DontStopServices
No need to stop services
2018-04-29 18:38:34 +01:00
Adam Warner
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
Adam Warner
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
Adam Warner
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists 2018-04-29 13:39:17 +01:00
Mark Drobnak
0df8d0a4e2
Merge pull request #2153 from MichaIng/patch-1
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115
2018-04-28 20:17:18 -04:00
MichaIng
43f19034b9
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115
+ Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".
2018-04-28 15:17:29 +02:00
Adam Warner
2e6a937240
Merge pull request #2151 from pi-hole/FTLDNS-gravity-simplelists
Update FTLDNS branch
2018-04-25 06:57:49 +01:00
Adam Warner
05d8a7f6be
Merge pull request #2147 from pi-hole/fix/borkedUpdate
Restore functionality to `pihole -up` broken in #2115
2018-04-23 21:14:26 +01:00
Adam Warner
ceaf4bc6bc
Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-23 20:46:57 +01:00
Adam Warner
f2cc2f433c
Merge pull request #2140 from pi-hole/FTLDNS-gravity-simplelists
Use domain list format for black.list and gravity.list
2018-04-23 20:29:32 +01:00
Dan Schaper
858aa6255c
Merge pull request #2145 from pi-hole/fix/2115
Add missing `/` to line 1511
2018-04-23 07:19:14 -07:00
bcambl
1d8ea9e869 Fix static IP checking on Fedora
This bug was introduced by #1758 where the CIDR was removed from the static IP check.
The CIDR was acting as a boundary so we need to test for a boundary or a slash character.

Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-04-23 06:42:36 -06:00
Adam Warner
8ead0b5483
@fourdee dropped this: /
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-23 11:59:39 +01:00