arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 06:08:21 +00:00
Code Issues Releases Wiki Activity
3,246 Commits 8 Branches 109 Tags 19 MiB
f35ea9a3ca
Commit Graph

3246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
DL6ER
1cae76b443
Merge pull request #2126 from pi-hole/FTLDNS-recursive-resolver 
Add backend changes for supporting a local DNS server
 2018-04-18 22:01:43 +02:00
DL6ER
828e8d2ae4
Merge pull request #2040 from pi-hole/FTLDNS 
FTLDNS Integration
 2018-04-18 20:20:39 +02:00
DL6ER
ce35509a40
Change command to "pihole -a localdnsport X" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:30:51 +02:00
DL6ER
24b8b4e904
Add backend changes for supporting a local recursive DNS server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:12:20 +02:00
Daniel (Fourdee)
c2c1dc7469 Ensuring bot pleasure 
https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748
 2018-04-18 04:38:07 +01:00
Daniel (Fourdee)
47c1071bb8 Minor 
+ Add info in regards to disabling web server install:
https://github.com/pi-hole/pi-hole/pull/2115
 2018-04-18 04:24:48 +01:00
Daniel (Fourdee)
e401651f09 Update https://github.com/pi-hole/pi-hole/pull/2115 
+ Patch existing systems with the new variable changes using
'accountForRefactor'
+ Prompt user to install webserver
 2018-04-18 04:11:32 +01:00
Mark Drobnak
1449def040
Merge pull request #2049 from pi-hole/tweak/readme 
update donation and affiliate links. also link to trademark guideline…
 2018-04-17 20:25:09 -04:00
Dan Schaper
d4d1ec2568
Merge pull request #2124 from pi-hole/development 
Internal
 2018-04-17 11:54:50 -07:00
Adam Warner
7455ac9bfb
Run chooseBlocklists on EVERY reconfigure, not only if the adlist file does not esist. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 19:46:36 +01:00
Adam Warner
b6b1dcb275
delete adlists.list if user cancels out of this dialog 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 19:35:46 +01:00
Adam Warner
2e4f49a223
Default all to on, change up wording. This commit can be rolled back, it's just an option! 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 17:10:53 +01:00
Adam Warner
88d4108f92
- Add new whipstail to choose from example blocklists on new install 
- remove adlists.default
- do not copy non-existent adlists.default on run of gravity

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 10:33:06 +01:00
Dan Schaper
c9f3c02cb7
Merge pull request #2027 from ravron/ravron-urls-in-query-strings 
Prevent inadvertent blocking of good domains appearing in query strings
 2018-04-16 17:31:51 -07:00
Dan Schaper
557372b312
Merge pull request #2119 from pi-hole/new/sticklerCI-extras 
add some more linters to stickler
 2018-04-15 18:28:00 -07:00
Adam Warner
18b24535fe
Lets try the correct name for csslint 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 23:46:52 +01:00
Adam Warner
20e0bca71d
add some more linters to stickler 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 23:45:36 +01:00
Adam Warner
6ba53c1ac0
Merge branch 'development' into FTLDNS 2018-04-15 20:46:13 +01:00
Adam Warner
699d419c71
Merge pull request #2116 from pi-hole/FTLDNS_UpdateCheck 
Check for new updates without actually updating
 2018-04-15 20:42:29 +01:00
Mark Drobnak
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs 
Get head and tail of pihole-FTL.log during debug process
 2018-04-15 14:23:25 -04:00
Adam Warner
e49a9096a5
accidentally a 'shift' 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 18:46:35 +01:00
Adam Warner
33148ba832
Add help text to pihole command to document new flag 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 18:30:13 +01:00
Adam Warner
bca23dd896
Allow passing of --check-only to update script. 
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 18:25:35 +01:00
Daniel (Fourdee)
3a483a1b20 install_web_server 
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
 2018-04-15 02:08:16 +01:00