Christian Göttsche
|
51daeaa6ab
|
basic-install: document how to continue after SELinux check
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
4 years ago |
Dan Schaper
|
514dc013df
|
Merge pull request #3597 from yubiuser/tweak/OS_detection
Adds OS and version to output if unsupported OS is detected
|
4 years ago |
Dan Schaper
|
548ad6375d
|
Merge pull request #3524 from pi-hole/fix/status_checking
Fix pihole status to not rely on a TCP port test
|
4 years ago |
Christian König
|
6fc7dc28a2
|
Count elements of array instead
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
Christian König
|
b207ceeab2
|
Report and exit if dig supportedOS returns nothing
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
Christian König
|
8380112129
|
Resolve conflicts
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
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.
|
4 years ago |
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>
|
4 years ago |
Dan Schaper
|
dfd331c5b7
|
Merge pull request #3608 from yubiuser/fix/customDNSfile
Create custom.list during install/update if it doesn't exist
|
4 years ago |
Dan Schaper
|
0a81d687e8
|
Update automated install/basic-install.sh
|
4 years ago |
Christian König
|
dfcdfd4b0a
|
Remove empty line
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
Christian König
|
ec9f490fcc
|
Remove separate install function, move to installConfigs(), use pihole syntax
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
Christian König
|
331502e14c
|
Add variable that got lost
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
Christian König
|
18c24d985f
|
Create custom.list during install/update if it doesn't exist
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
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>
|
4 years ago |
Adam Warner
|
98dc51869e
|
accidentally missed \\n
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
510b646736
|
change up the verbiage with something that works (tested)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
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>
|
4 years ago |
DL6ER
|
61616b8c86
|
Merge pull request #3599 from pi-hole/fix/gravity_cronjob
Fix for gravity cronjob
|
4 years ago |
James Lagermann
|
be14000778
|
added blanks-around-fences to correct lint errors
Signed-off-by: James Lagermann <james.lagermann@corelight.com>
|
4 years ago |
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>
|
4 years ago |
DL6ER
|
527fc3c5cf
|
Also pidof -> pgrep in gravity.sh
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
4 years ago |
DL6ER
|
8f7f0881c6
|
Add /usr/sbin to cronjob PATH
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
4 years ago |
DL6ER
|
17aabf26f7
|
Also use pkill/pgrep in the FTL service script
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
4 years ago |
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>
|
4 years ago |
Adam Warner
|
ea22774d16
|
Wrap entire function in the check for the ENVVAR
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
James Lagermann
|
5c9fbd7d1f
|
Merge pull request #3 from pi-hole/development
Development
|
4 years ago |
Dan Schaper
|
b0ea043b6a
|
Merge pull request #3581 from jokajak/patch-1
chore(README.md): Grammar fix
|
4 years ago |
Josh
|
27366fe9f0
|
chore(README.md): Grammar fix
Fix small grammar issue in README.md
Signed-off-by: Jokajak <jokajak@gmail.com>
|
4 years ago |
MichaIng
|
25b873cf7b
|
Add default locations to PATH to assure that all basic commands are available
Signed-off-by: MichaIng <micha@dietpi.com>
|
4 years ago |
Adam Warner
|
643d2c0f3e
|
add missing port number validation section to valid_ip6
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
533e5dddd0
|
clarify examples in case of unsupported OS
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
60f0ab51c9
|
Merge pull request #3555 from pi-hole/release/v5.1.1
Release/v5.1.1 -> development
|
4 years ago |
Adam Warner
|
f50cff54de
|
*innocent whistling*
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
acfb092e4b
|
fix minor bug in 5.1
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Dan Schaper
|
e4b2d29552
|
Merge pull request #3548 from pi-hole/tweak/supportedos.txt
add one
|
4 years ago |
Adam Warner
|
b4ca13b3ad
|
add one
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
b9b7d5f8eb
|
Merge pull request #3547 from pi-hole/fix/debug20.04
fallback to NC if curl fails on uploadgit checkout
|
4 years ago |
Adam Warner
|
849139176e
|
fallback to NC if curl fails on uploadgit checkout
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
ae0d1de188
|
Merge pull request #3545 from pi-hole/tweak/debugoutput
Add additional information about local debug log location
|
4 years ago |
Adam Warner
|
b8bba7951f
|
Just one more newline, give it to me.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
76ce5ec66b
|
Add additional information about local debug log location
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
4 years ago |
Adam Warner
|
7b41b99549
|
Merge pull request #2887 from tlk/fix/reenable
Prevent "pihole disable $timeout" from messing up future state changes
|
4 years ago |
DL6ER
|
0cc999ea1f
|
Merge pull request #3543 from pi-hole/tweak/readme
Update README.md
|
4 years ago |
Dan Schaper
|
a99eac9d10
|
Update README.md
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
4 years ago |
DL6ER
|
e76f0119b4
|
Merge pull request #3534 from yubiuser/tweak/saveLocation
Use gravity's adlist_id in filename when saving downloaded adlist locally
|
4 years ago |
Adam Warner
|
a3ae47023f
|
Merge pull request #3533 from pi-hole/release/v5.1
Release/v5.1
|
4 years ago |
Adam Warner
|
6ff0926f4a
|
Merge pull request #3532 from pi-hole/XhmikosR-patch-1
Fix minor typo
|
4 years ago |
Christian König
|
73963fecda
|
Use gravity's adlist_id in filename when saving downloaded adlist locally
Signed-off-by: Christian König <ckoenig@posteo.de>
|
4 years ago |
XhmikosR
|
d8822b70cf
|
Fix minor typo
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
|
4 years ago |