f50cff54de
*innocent whistling*
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-07-15 23:49:17 +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
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
d8822b70cf
Fix minor typo
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-07-05 15:12:02 +03: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
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
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
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
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
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
03a8cff55e
read > mapfile as suggested by @dschaper
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-06-05 21:01:53 +01: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
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
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
d90313fe4d
Fix/tweak blocking page
...
* fix favicon
* add meta charset
* add html lang
* add a page title
* remove unneeded html end tags
* fix viewport tag to allow zooming
* compress the "blocked by Pi-hole" SVG
* remove trailing spaces
* switch to double colon pseudo elements (works from IE9 and newer)
* add missing vendor prefixes
* other minor tweaks
* add `Access-Control-Allow-Origin` header to all font types
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2020-05-31 15:54:11 +03: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
903808a477
Improved explanation of why this script is needed
...
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
2020-05-30 03:14:03 +02:00
005da06b3d
Use PI_HOLE_BIN_DIR as introduced in PR #2886
...
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
2020-05-30 03:13:51 +02:00
852f6b95f5
Prevent "pihole disable $timeout" from messing up future state changes
...
Signed-off-by: Thomas L. Kjeldsen <tlk@closureconsulting.com>
2020-05-30 02:58:27 +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
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8
...
Start pihole-FTL after network
2020-05-25 21:27:27 +02: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
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
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
b421e422c2
Merge pull request #3351 from marank/development
...
Added support for CNAME record add/remove
2020-05-20 09:13:54 +02:00
5c17e41cf1
Start pihole-FTL after network
...
"$network" on a systemd-driven OS leads to "After=network-online.target" in the generated systemd unit.
This target is no guarantee that all network interfaces have been fully configured, as it depends on the related network services types, but at least it reduces the risk that those have not fully finished their job when pihole-FTL starts. If this is the case, certain issues can occur:
- https://github.com/pi-hole/pi-hole/issues/2924
- https://discourse.pi-hole.net/t/have-to-pihole-restartdns-after-reboot/28772
Runtime files are now consistently created in "/run" instead of "/var/run". The second is a symlink to the first for backwards compatibility but on none-ancient distro versions one should use "/run", systemd even prints a warnings if service files use "/var/run". The service file used "/run" and "/var/run" both, in cases for the same files/directories before, which does not directly cause issues currently, due to the symlink, but is inconsistent at best.
Signed-off-by: MichaIng <micha@dietpi.com>
2020-05-16 13:38:18 +02:00
10addc5923
Merge pull request #3218 from JulienOrain/patch-1
...
fix typo
2020-05-14 09:48:59 -07:00
c76435883b
Merge pull request #3360 from dnicolson/fix-github-capitalisation
...
Fix GitHub capitalisation
2020-05-13 16:56:36 -07:00
ab753e88a2
Fix GitHub capitalisation
...
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
2020-05-13 12:55:00 +02:00
be25b4d9c4
Merge pull request #3352 from pi-hole/merge-master-dev
...
Merge master dev
2020-05-12 22:27:24 +01:00
9e96ff37de
Fix merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-12 22:16:43 +01:00
a9c66c7b45
Implement pihole -a theme option
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-12 23:03:49 +02:00
2b9898e9ca
Fixed indentation
...
Signed-off-by: Matthias Rank <development@m-rank.de>
2020-05-12 21:04:30 +02:00
0add5eb291
Added support for CNAME record add/remvoe
...
Signed-off-by: Matthias Rank <development@m-rank.de>
2020-05-12 21:02:29 +02:00
7cc35d3b04
Add update to gravity database version 12, renaming the Unassociated group to Default group.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-05-07 18:01:37 +02:00
78469ee58d
Merge pull request #3255 from pi-hole/tweak/emailregex
...
Enhanced email validation regex
2020-05-06 09:48:26 +02:00
369288cc48
Update advanced/Scripts/webpage.sh
...
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
2020-05-06 08:40:54 +01:00
742d802940
Merge pull request #3027 from XhmikosR/patch-1
...
Serve JS files with utf-8 charset too
2020-05-05 12:29:27 -07:00
017d405b28
Merge pull request #3307 from pi-hole/tweak/debugger_type_display
...
Improve debugger database table printing
2020-04-29 11:48:47 -07:00
ddb354f78b
Add enable indentation for the domainlist
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-29 06:23:29 +02:00
20ef5e0264
Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-24 10:33:46 +02:00
Adam Warner
XhmikosR
Dan Schaper
DL6ER
DL6ER
Thomas L. Kjeldsen
Frank Riley
MichaIng
Dave Nicolson
Matthias Rank
Dan Schaper