Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
3270 commits 8 branches 109 tags 27 MiB
Commit graph

3270 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Fauxsys
72c081cfd6 Fix for unattended installations #1767 #1768 #1834 
Removed updatePihole() function and updated if/then statements in installPihole() and main(). Corrected minor typos.

Signed-off-by: Fauxsys <fiber.cipher@gmail.com>
 2018-04-23 04:53:57 -04:00
Mark Drobnak
1f701c94a7
Merge pull request #2115 from Fourdee/Install-Web-Server 
--disable-install-webserver
 2018-04-22 15:56:11 -04:00
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server 2018-04-22 09:23:11 +01:00
Adam Warner
9c29bd627e
fix user blacklisting 2018-04-21 23:55:33 +01:00
DL6ER
d24b141d8b
Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-21 23:58:42 +02:00
DL6ER
bac9e005ae
Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-21 23:27:36 +02:00
Daniel (Fourdee)
60bcca54eb Minor 
+ indentation
 2018-04-21 08:29:21 +01:00
Daniel (Fourdee)
eccea8a911 Minor 
+ Fix indentation
+ Stick with case, add "On" to provide INFO print out, although its not
technically required as INSTALL_WEB_SERVER=true is default value.
 2018-04-21 08:27:31 +01:00
Mark Drobnak
0833d0d8d5
Merge pull request #2133 from mbologna/patch-1 
Fix: add psmisc as dependency
 2018-04-20 13:17:46 -04:00
Michele Bologna
55fce489bc Fix: add psmisc as dependency 
Debian 9.4 does not install `psmisc` by default and the following error will happen during installation:

```
  [✗] /usr/local/bin/pihole: line 353: killall: command not found
/usr/local/bin/pihole: line 364: killall: command not found
```

This patch adds `psmisc` (that contains `killall`) as dependency

Signed-off-by: Michele Bologna <michele.bologna@gmail.com>
 2018-04-19 23:41:23 +02:00
Adam Warner
2ce40c3c07
Merge pull request #2132 from rwky/development 
Fixed typo in README
 2018-04-19 19:49:29 +01:00
Rowan
255cfb7d62 Fixed typo in README 
Signed-off-by: Rowan Wookey <admin@rwky.net>
 2018-04-19 19:45:11 +01:00
Adam Warner
8a327be400
Merge pull request #2130 from pi-hole/FTLDNS 
Internal FTLDNS -> dev
 2018-04-18 22:09:31 +01:00