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
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
527fc3c5cf
Also pidof -> pgrep in gravity.sh
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-07-21 22:03:54 +02:00
8f7f0881c6
Add /usr/sbin to cronjob PATH
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-07-21 21:21:24 +02:00
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
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
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
5c9fbd7d1f
Merge pull request #3 from pi-hole/development
...
Development
2020-07-20 16:50:17 -05:00
b0ea043b6a
Merge pull request #3581 from jokajak/patch-1
...
chore(README.md): Grammar fix
2020-07-20 13:06:29 -07:00
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
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
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
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
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
56cd7c4d59
Merge pull request #3549 from pi-hole/release/v5.1.1
...
Pi-hole core v5.1.1
2020-07-15 23:56:47 +01:00
f50cff54de
*innocent whistling*
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 23:49:17 +01:00
acfb092e4b
fix minor bug in 5.1
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 23:38:08 +01:00
e9b039139c
Merge pull request #3531 from pi-hole/release/v5.1
...
Pi-hole Core v5.1
2020-07-15 22:35:12 +01:00
e4b2d29552
Merge pull request #3548 from pi-hole/tweak/supportedos.txt
...
add one
2020-07-15 14:14:32 -07:00
b4ca13b3ad
add one
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 22:03:07 +01:00
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
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
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
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
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
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
0cc999ea1f
Merge pull request #3543 from pi-hole/tweak/readme
...
Update README.md
2020-07-14 05:36:12 +02:00
a99eac9d10
Update README.md
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-07-13 14:29:45 -07:00
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
a3ae47023f
Merge pull request #3533 from pi-hole/release/v5.1
...
Release/v5.1
2020-07-05 13:38:54 +01:00
6ff0926f4a
Merge pull request #3532 from pi-hole/XhmikosR-patch-1
...
Fix minor typo
2020-07-05 13:36:41 +01:00
73963fecda
Use gravity's adlist_id in filename when saving downloaded adlist locally
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-05 14:32:33 +02:00
d8822b70cf
Fix minor typo
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-07-05 15:12:02 +03:00
f50d59fe94
Merge pull request #3425 from XhmikosR/lighttpd
...
Tweak lighttpd configs
2020-07-02 10:53:56 +01:00
cf1c1e2e7e
Tweak lighttpd configs
...
* Compress more types
* Add charset=utf-8 in more text types
* Use proper media types
* Add default expire header
* Use consistent indentation
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-07-02 12:28:26 +03:00
f5a5f68a1a
Merge pull request #3403 from XhmikosR/XhmikosR-patch-1
...
Fix/tweak blocking page
2020-07-02 10:27:16 +01:00
94cd7f59d4
Make verbose output the default.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-07-01 18:49:31 +02:00
6009e86947
Fix pihole status to not rely on a TCP port test. The current test can fail even when there is no error i case the max. number of TCP workers is reached.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-07-01 18:39:28 +02:00
56e0549c7a
Merge pull request #3420 from XhmikosR/XhmikosR-patch-4
...
Markdown tweaks
2020-06-30 13:20:29 -07:00
49f099e382
Merge pull request #3510 from pi-hole/fix/ip_validation_setdns
...
Also validate IPV6 in the `setdns` function
2020-06-25 17:58:55 +01:00
3205606fc3
Also validate IPV6 in the setdns function
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-23 20:38:18 +01:00
3aaf9d89b3
Merge pull request #3260 from pi-hole/new/rev-server
...
Improve conditional forwarding
2020-06-21 13:26:07 -07:00
2c3aa9ab00
Merge pull request #3491 from pi-hole/fix_ip_address_section
...
Fix fresh install on dev branch not working
2020-06-21 21:58:36 +02:00
bf392d7a60
Merge pull request #3489 from pi-hole/ip_validation
...
Improve IP validation function
2020-06-21 21:56:30 +02:00
9bf0f2a161
Reduce handholding when trying to foresee the intentions of the user. The code does now preserve legacy behavior and users can open up the subnet manually if they like.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-06-21 21:47:30 +02:00
bbfbf67fcf
further simplify the function, per @dl6er's suggestion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-15 22:52:24 +01:00
fe30ce10d3
simpler regex suggested by @MichaIng
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-15 21:21:40 +01:00
3136d239df
Merge pull request #3492 from pi-hole/fix/man-restartdns
...
Improve man pihole restartdns section
2020-06-15 10:05:05 -07:00
c9350fa76d
Improve man pihole restartdns section.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-06-14 21:59:20 +02:00
b96ce13085
Merge pull request #3490 from pi-hole/fix_os_check
...
Fix new os_check
2020-06-14 00:24:33 +01:00
