Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-30 16:52:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
4904 commits 10 branches 110 tags 28 MiB
Commit graph

4904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Schaper
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
Adam Warner
9844a3288f
Same change as 03a8cff 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-05 21:06:25 +01:00
Adam Warner
03a8cff55e
read > mapfile as suggested by @dschaper 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-05 21:01:53 +01:00
Dan Schaper
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
XhmikosR
52cb389d94 Markdown tweaks 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 16:19:21 +03:00
DL6ER
2b1bc6a46e
Replace possible "\#" by "#". This fixes AdminLTE#1427 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 09:32:40 +02:00
DL6ER
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
DL6ER
318ca75269
Merge branch 'development' into new/rev-server 2020-06-04 08:56:08 +02:00
Adam Warner
13a49b0753
Merge pull request #3466 from pi-hole/tweak/improve_unique_domains 
Allow certain domain duplicates
 2020-06-03 21:41:20 +01:00
Adam Warner
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
Adam Warner
8fef35be0f
Update README.md 
remove dead link to gitter
 2020-06-03 16:11:09 +01:00
DL6ER
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
Adam Warner
5488fb0caf
Merge pull request #3463 from jesterchen/patch-1 
Patch 1
 2020-06-01 11:29:17 +01:00
jesterchen
0a47140239 Merge branch 'patch-1' of github.com:jesterchen/pi-hole into patch-1 2020-06-01 12:06:38 +02:00
jesterchen
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
jesterchen
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
XhmikosR
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
Dan Schaper
c73001f392
Merge pull request #3412 from XhmikosR/links 
Update links
 2020-05-30 12:45:15 -07:00
XhmikosR
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
Thomas L. Kjeldsen
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
Thomas L. Kjeldsen
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
Thomas L. Kjeldsen
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
DL6ER
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
DL6ER
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
Adam Warner
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
Adam Warner
4f7bb7b811
Remove deprecated Disconnect lists from "defaults" 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-26 21:23:44 +01:00
Adam Warner
01ab82b869
Merge pull request #3446 from pgl/development 
Updated gravity.sh to allow semicolons in URLs
 2020-05-26 15:26:28 +01:00
Peter Lowe
dd205c55c1 Updated gravity.sh to allow semicolons 
Signed-off-by: Peter Lowe <pgl@yoyo.org>
 2020-05-26 15:53:10 +02:00
DL6ER
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8 
Start pihole-FTL after network
 2020-05-25 21:27:27 +02:00
Adam Warner
acf2879057
Address sticklr complaints 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-25 17:49:19 +01:00
DL6ER
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
Adam Warner
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
Adam Warner
ee172cd6e9
Merge pull request #3423 from pi-hole/debug-extras 
Debug extras
 2020-05-22 07:53:06 +01:00
Adam Warner
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
Adam Warner
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
Dan Schaper
3f83c314b6
Merge pull request #3419 from XhmikosR/XhmikosR-patch-3 
Remove csslint from Strickler CI
 2020-05-21 10:11:53 -07:00
XhmikosR
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
Frank Riley
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
DL6ER
b421e422c2
Merge pull request #3351 from marank/development 
Added support for CNAME record add/remove
 2020-05-20 09:13:54 +02:00
Adam Warner
60afebfd03
Merge pull request #3406 from pi-hole/tweak/words 
Use `toggle` instead of `select`
 2020-05-19 07:46:40 +01:00
Adam Warner
414ab53d9a
Use toggle instead of select to remove any hint of a doubt that the option already selected by default can be deselected 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-18 22:29:36 +01:00
MichaIng
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
Adam Warner
5ce8791693
Merge pull request #3388 from pvogt09/fix/no_adlist_selected 
fix #3336 by creating adlist file even if no list was selected by user
 2020-05-15 23:22:35 +01:00
pvogt09
3c6ea2612d fix #3336 by creating adlist file even if no list was selected by user 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-05-15 17:52:57 +02:00
Dan Schaper
10addc5923
Merge pull request #3218 from JulienOrain/patch-1 
fix typo
 2020-05-14 09:48:59 -07:00
Dan Schaper
9ee37cb503
Merge pull request #3369 from a-p-o/remove-shop-link 
Remove store/shop link from README
 2020-05-14 09:46:21 -07:00
Alex Ordonez
e1b1512183 Remove store/shop link from README 
According to @dschaper, the store is no longer open:
https://www.reddit.com/r/pihole/comments/cmywyi/pi_hole_store/ew5m33s/

Signed-off-by: Alex Ordonez <me@ordonezalex.com>
 2020-05-13 19:24:54 -07:00
Dan Schaper
c76435883b
Merge pull request #3360 from dnicolson/fix-github-capitalisation 
Fix GitHub capitalisation
 2020-05-13 16:56:36 -07:00
Dan Schaper
2ede032de5
Merge pull request #3359 from dnicolson/patch-1 
Update documentation links
 2020-05-13 16:40:51 -07:00
Dave Nicolson
8dc8c350be Update documentation links 
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
 2020-05-13 13:22:09 +02:00