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
7ea6d7b92b
remove ; so IFS changes don't stick
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-14 00:17:51 +01:00
011fa8c6ea
fix sticklr complaint
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-13 21:47:00 +01:00
1ebf0785b6
move dnsutils/bind-utils to installed deps and only check OS is supported after installing installer deps
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-13 21:33:03 +01:00
0320d85028
Additionally source the install script in webpage.sh to validate IP entered on `pihole -a setdns`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-13 20:57:57 +01:00
95f4c632f7
expand valid_ip to allow for custom ports
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-13 20:30:03 +01:00
4b59287683
Merge pull request #3441 from pi-hole/new/os_check
...
Display warning if unsupported OS is detected
2020-06-05 13:39:39 -07:00
5f9dac8d2b
Merge pull request #3434 from pi-hole/new/os_detect
...
Change OS Detection in debug script
2020-06-05 13:38:50 -07:00
9844a3288f
Same change as 03a8cff
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-05 21:06:25 +01:00
03a8cff55e
read > mapfile as suggested by @dschaper
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-05 21:01:53 +01:00
c9dd3ee2e9
Merge pull request #3470 from pi-hole/fix/escape_where_should_be_none
...
Replace possible "\#" by "#" to fix AdminLTE#1427
2020-06-05 12:25:53 -07:00
2b1bc6a46e
Replace possible "\#" by "#". This fixes AdminLTE#1427
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 09:32:40 +02:00
6160eb6894
This regex is too complex for bash's own replacement. Add ignore for the shellcheck rule.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-04 09:22:40 +02:00
318ca75269
Merge branch 'development' into new/rev-server
2020-06-04 08:56:08 +02:00
13a49b0753
Merge pull request #3466 from pi-hole/tweak/improve_unique_domains
...
Allow certain domain duplicates
2020-06-03 21:41:20 +01:00
58724a38a9
Improve detection and display of supported/unsupported OS in debug script
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-03 17:57:22 +01:00
8fef35be0f
Update README.md
...
remove dead link to gitter
2020-06-03 16:11:09 +01:00
202ba055ea
Change UNIQUEness constraint from (domain) to (domain, type) in the domainlist table. This will allow duplicates which can be associated to different groups.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-06-02 10:49:35 +02:00
5488fb0caf
Merge pull request #3463 from jesterchen/patch-1
...
Patch 1
2020-06-01 11:29:17 +01:00
0a47140239
Merge branch 'patch-1' of github.com:jesterchen/pi-hole into patch-1
2020-06-01 12:06:38 +02:00
7248d1a504
Ensure that adlistFile is created before chmodding
...
If an user installs Pi-hole without selecting any adlists, the installer emits a warning and exits. By touching the file this is prevented.
Signed-off-by: jesterchen <github@jesterweb.de>
2020-06-01 12:06:02 +02:00
7934a9bcb4
Ensure that adlistFile is created before chmodding
...
If an user installs Pi-hole without selecting any adlists, the installer emits a warning and exits. By touching the file this is prevented.
2020-06-01 12:00:29 +02:00
c73001f392
Merge pull request #3412 from XhmikosR/links
...
Update links
2020-05-30 12:45:15 -07:00
7579ab178a
Update links
...
* use https when possible
* replace coverage with a link to the docs page in README.md
* remove obsolete affiliate link in README.md
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-30 21:50:16 +03:00
5dc7ec0fa0
Merge pull request #3455 from pi-hole/tweak/FTL_niceness
...
Add CAP_SYS_NICE to FTL's capabilities
2020-05-28 22:00:49 +02:00
de8976da7a
Add CAP_SYS_NICE to FTL's capabilities so it can control its own niceness.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-28 21:18:31 +02:00
e43450f56e
Merge pull request #3451 from pi-hole/its-getting-awful-quiet-in-here
...
Remove deprecated Disconnect lists from "defaults"
2020-05-27 08:46:32 +01:00
4f7bb7b811
Remove deprecated Disconnect lists from "defaults"
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-26 21:23:44 +01:00
01ab82b869
Merge pull request #3446 from pgl/development
...
Updated gravity.sh to allow semicolons in URLs
2020-05-26 15:26:28 +01:00
dd205c55c1
Updated gravity.sh to allow semicolons
...
Signed-off-by: Peter Lowe <pgl@yoyo.org>
2020-05-26 15:53:10 +02:00
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8
...
Start pihole-FTL after network
2020-05-25 21:27:27 +02:00
acf2879057
Address sticklr complaints
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-25 17:49:19 +01:00
27f0fd2372
Merge pull request #3415 from fhriley/reload_privacy
...
Reload the lists, which will cause the cached privacy level to be upd…
2020-05-25 18:47:44 +02:00
af1129fc28
Add a check at the top of the script to determine if the script is being run on a supported OS
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-25 17:40:20 +01:00
ee172cd6e9
Merge pull request #3423 from pi-hole/debug-extras
...
Debug extras
2020-05-22 07:53:06 +01:00
d0e250a616
Ensure pihole-FTL.conf is parsed, as well as external.conf for lighttpd, to rule out any custom modifications.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-21 22:25:00 +01:00
b2ba55c27b
Show details of any remotes on the git repositories
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-21 21:23:26 +01:00
3f83c314b6
Merge pull request #3419 from XhmikosR/XhmikosR-patch-3
...
Remove csslint from Strickler CI
2020-05-21 10:11:53 -07:00
5094fab491
Remove csslint from Strickler CI
...
There's only one CSS file and the page where it's used has become obsolete.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-21 17:44:32 +03:00
9d04c517e6
Reload the lists, which will cause the cached privacy level to be updated.
...
Signed-off-by: Frank Riley <fhriley@gmail.com>
2020-05-20 15:47:53 -07:00
Adam Warner
Dan Schaper
DL6ER
DL6ER
jesterchen
XhmikosR
Peter Lowe
Frank Riley