tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,530 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

4530 Commits

Author SHA1 Message Date
Dan Schaper fa574cfd08
Set non-master to point to latest. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-07-30 10:05:27 -07:00
Dan Schaper 932cdd3329 Use the .github repository. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-07-30 09:38:50 -07:00
Dan Schaper dc2781d1f9 .travis.yml is now a stub. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-07-30 09:26:04 -07:00
Adam Warner 48820d181c
Merge pull request #3620 from yubiuser/tweak/dig_supportedOS 
Report and exit if dig supportedOS returns nothing
 2020-07-30 17:00:01 +01:00
Christian Göttsche 51daeaa6ab basic-install: document how to continue after SELinux check 
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
 2020-07-30 14:50:42 +02:00
Dan Schaper 514dc013df
Merge pull request #3597 from yubiuser/tweak/OS_detection 
Adds OS and version to output if unsupported OS is detected
 2020-07-28 07:42:41 -07:00
Dan Schaper 548ad6375d
Merge pull request #3524 from pi-hole/fix/status_checking 
Fix pihole status to not rely on a TCP port test
 2020-07-28 07:24:34 -07:00
Christian König 6fc7dc28a2 Count elements of array instead 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-07-28 10:25:57 +02:00
Christian König b207ceeab2 Report and exit if dig supportedOS returns nothing 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-07-28 09:51:31 +02:00
Christian König 8380112129 Resolve conflicts 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-07-28 09:40:45 +02:00
Dan Schaper dffb58ae8f
Merge pull request #3596 from pi-hole/tweak/wherecheck 
Wrap entire function in the check for the ENVVAR, add `ns1.pi-hole.net` to `dig` check.
 2020-07-27 10:01:14 -07:00
Adam Warner 0ff32c3629
Use ns1.pi-hole.net to resolve versions.pi-hole.net so that we do not see DNS cookie issues 
Co-Authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-27 17:44:22 +01:00
Dan Schaper dfd331c5b7
Merge pull request #3608 from yubiuser/fix/customDNSfile 
Create custom.list during install/update if it doesn't exist
 2020-07-26 12:51:19 -07:00
Dan Schaper 0a81d687e8
Update automated install/basic-install.sh 2020-07-26 12:31:11 -07:00
Christian König dfcdfd4b0a Remove empty line 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-07-26 12:27:55 +02:00
Christian König ec9f490fcc Remove separate install function, move to installConfigs(), use pihole syntax 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-07-24 20:32:32 +02:00
Christian König 331502e14c Add variable that got lost 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-07-23 20:52:21 +02:00
Christian König 18c24d985f Create custom.list during install/update if it doesn't exist 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2020-07-23 20:43:12 +02:00
Adam Warner ddb36c013d
it helps if the echo goes variable set goes in the right place 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-22 22:39:03 +01:00
Adam Warner 98dc51869e
accidentally missed \\n 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-22 22:30:51 +01:00
Adam Warner 510b646736
change up the verbiage with something that works (tested) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-22 22:29:38 +01:00
James Lagermann da6b78f4c5
Merge branch 'development' into wormhole 
changed console to bash
clone to fork

Signed-off-by: James Lagermann <james.lagermann@corelight.com>

Update CONTRIBUTING.md

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-22 11:32:10 -05:00
DL6ER 61616b8c86
Merge pull request #3599 from pi-hole/fix/gravity_cronjob 
Fix for gravity cronjob
 2020-07-21 23:11:29 +02:00
James Lagermann be14000778
added blanks-around-fences to correct lint errors 
Signed-off-by: James Lagermann <james.lagermann@corelight.com>
 2020-07-21 15:41:50 -05:00
James Lagermann 93c1a62998
Update CONTRIBUTING.md 
Co-authored-by: jrschat <54955683+jrschat@users.noreply.github.com>
signed-off-by: James Lagermann <james.lagermann@corelight.com>
 2020-07-21 15:41:14 -05:00
DL6ER 527fc3c5cf
Also pidof -> pgrep in gravity.sh 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-21 22:03:54 +02:00
DL6ER 8f7f0881c6
Add /usr/sbin to cronjob PATH 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-21 21:21:24 +02:00
DL6ER 17aabf26f7
Also use pkill/pgrep in the FTL service script 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-21 21:21:17 +02:00
DL6ER 6ee6eea1fb
Use pkill instead of the somewhat fragile combination of kill + pidof. This solves some issues especially when there are many TCP workers floating around. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-07-21 21:13:40 +02:00
Adam Warner ea22774d16
Wrap entire function in the check for the ENVVAR 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-21 18:47:13 +01:00
James Lagermann 5c9fbd7d1f
Merge pull request #3 from pi-hole/development 
Development
 2020-07-20 16:50:17 -05:00
Dan Schaper b0ea043b6a
Merge pull request #3581 from jokajak/patch-1 
chore(README.md): Grammar fix
 2020-07-20 13:06:29 -07:00
Josh 27366fe9f0 chore(README.md): Grammar fix 
Fix small grammar issue in README.md

Signed-off-by: Jokajak <jokajak@gmail.com>
 2020-07-20 15:50:27 -04:00
MichaIng 25b873cf7b Add default locations to PATH to assure that all basic commands are available 
Signed-off-by: MichaIng <micha@dietpi.com>
 2020-07-18 17:30:27 +02:00
Adam Warner 643d2c0f3e
add missing port number validation section to valid_ip6 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-16 21:31:45 +01:00
Adam Warner 533e5dddd0
clarify examples in case of unsupported OS 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-16 18:33:53 +01:00
Adam Warner 60f0ab51c9
Merge pull request #3555 from pi-hole/release/v5.1.1 
Release/v5.1.1 -> development
 2020-07-16 18:29:00 +01:00
Adam Warner f50cff54de
*innocent whistling* 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 23:49:17 +01:00
Adam Warner acfb092e4b
fix minor bug in 5.1 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 23:38:08 +01:00
Dan Schaper e4b2d29552
Merge pull request #3548 from pi-hole/tweak/supportedos.txt 
add one
 2020-07-15 14:14:32 -07:00
Adam Warner b4ca13b3ad
add one 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 22:03:07 +01:00
Adam Warner b9b7d5f8eb
Merge pull request #3547 from pi-hole/fix/debug20.04 
fallback to NC if curl fails on uploadgit checkout
 2020-07-15 22:01:36 +01:00
Adam Warner 849139176e
fallback to NC if curl fails on uploadgit checkout 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 21:54:45 +01:00
Adam Warner ae0d1de188
Merge pull request #3545 from pi-hole/tweak/debugoutput 
Add additional information about local debug log location
 2020-07-15 21:25:59 +01:00
Adam Warner b8bba7951f
Just one more newline, give it to me. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:49:18 +01:00
Adam Warner 76ce5ec66b
Add additional information about local debug log location 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-07-15 20:45:02 +01:00
Adam Warner 7b41b99549
Merge pull request #2887 from tlk/fix/reenable 
Prevent "pihole disable $timeout" from messing up future state changes
 2020-07-15 20:23:33 +01:00
DL6ER 0cc999ea1f
Merge pull request #3543 from pi-hole/tweak/readme 
Update README.md
 2020-07-14 05:36:12 +02:00
Dan Schaper a99eac9d10
Update README.md 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-07-13 14:29:45 -07:00
DL6ER e76f0119b4
Merge pull request #3534 from yubiuser/tweak/saveLocation 
Use gravity's adlist_id in filename when saving downloaded adlist locally
 2020-07-06 15:13:05 +02:00