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-16 11:13:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
4439 commits 10 branches 109 tags 27 MiB
Commit graph

4439 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
6977f655e3
fix a typo 
comment out some unused variables, but not deleting them in case there is a plan for them in future...

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 22:08:55 +01:00
Adam Warner
e6fc9dc75d
disable 2016 in two places and declare local variables 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 22:00:14 +01:00
Adam Warner
b57b3f4588
Disable SC2001 for generation of the_os 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 21:36:50 +01:00
Adam Warner
776ae92416
fix some shellcheck/stickler compaints in debug script 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 21:33:10 +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
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 17:01:54 +01:00
Adam Warner
8b5dcc3872
Match change made by 7edab27 to prevent merge conflict 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 16:53:57 +01:00
Adam Warner
36d9af10f0
Merge pull request #2108 from LudovicRousseau/fix_No_such_file_or_directory 
Fix sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory
 2018-04-13 16:47:59 +01:00
Dan Schaper
0c8fcbc684
Merge pull request #2105 from pi-hole/feature/self_dco 
Do not require DCO for Pi-hole Org members with GPG signed commits.
 2018-04-13 05:42:04 -07:00
Ludovic Rousseau
7edab27e53 Stylistic change to use an explicit if/then/fi 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 12:19:55 +02:00
Ludovic Rousseau
9b3531f634 Fix stylistic issue 
Expand variable using ${FTLconf}

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:48:34 +02:00
Ludovic Rousseau
d8f85a8981 Avoid a "No such file or directory" error 
Check the file /etc/pihole/pihole-FTL.conf exists before trying to use
it.
without the patch I get, each day, in my logs:
sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory

I use a variable FTLconf to not repeat the file name twice.

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:58 +02:00
Ludovic Rousseau
3b229489c2 Fix regex to find DBFILE= from configuration file 
The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE="
I don't know what the second '^' is used for.

With the change I now have the results:

DBFILE=/foo/bar
-> /foo/bar

  DBFILE=/foo/bar
-> /foo/bar

 # DBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

xDBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:50 +02:00
Mark Drobnak
c2fcbbb0c6
Merge pull request #2090 from Razvici/master 
Update pihole locahost probe for DNS status
 2018-04-12 11:17:33 -04:00
Jacob Salmela
8e82bf69d8
update wallet addresses 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-04-11 20:40:35 -05:00