Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
4377 commits 8 branches 109 tags 27 MiB
Commit graph

4377 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Dave Nicolson
ab753e88a2 Fix GitHub capitalisation 
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
 2020-05-13 12:55:00 +02:00
Adam Warner
d524f9a73b
Merge pull request #3353 from MichaIng/patch-1 
Only check SELinux states if "getenforce" command exists
 2020-05-13 00:39:32 +01:00
MichaIng
7d79cf5cce
Only check SELinux states if "getenforce" command exists 
- Currently, if the SELinux config file exists, installed SELinux is assumed.
- But removing e.g. an APT package via "apt-get remove" leaves config files in place, or they could be present for other reasons.
- If the getenforce command is not present but the config file is, currently the installer exists without error message when calling getenforce due to "set -e".
- With this change, the presence of getenforce command is checked first. If it is not present, selinux-utils is not installed, which is a core part of SELinux, pulled in by selinux-basics as well. So it can be assumed that no SELinux is active if this command is missing.

Signed-off-by: MichaIng <micha@dietpi.com>
 2020-05-12 23:45:56 +02:00
Adam Warner
be25b4d9c4
Merge pull request #3352 from pi-hole/merge-master-dev 
Merge master dev
 2020-05-12 22:27:24 +01:00
DL6ER
a1e913de7a
Merge pull request #3327 from pi-hole/new/dark 
Implement backend support for theming
 2020-05-12 23:19:35 +02:00
Adam Warner
9e96ff37de
Fix merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 22:16:43 +01:00
DL6ER
a9c66c7b45
Implement pihole -a theme option 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 23:03:49 +02:00
Matthias Rank
2b9898e9ca Fixed indentation 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-05-12 21:04:30 +02:00
Matthias Rank
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
Adam Warner
1b41a5d59a
Merge pull request #3347 from pi-hole/tweak/binary_detection 
Minor bugfix for Binary detection
 2020-05-12 17:31:29 +01:00
Adam Warner
987ae3810d
binary, here, should be l_binary 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-11 22:03:33 +01:00
Adam Warner
4d25f69526
Merge pull request #3321 from pi-hole/release/v5.0 
Pi-hole core v5.0
 2020-05-10 19:07:53 +01:00
DL6ER
e728d7f761
Merge pull request #3318 from pi-hole/tweak/default_group 
Rename default group to ... well ... "Default"
 2020-05-07 19:24:04 +02:00
DL6ER
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
DL6ER
78469ee58d
Merge pull request #3255 from pi-hole/tweak/emailregex 
Enhanced email validation regex
 2020-05-06 09:48:26 +02:00
Adam Warner
369288cc48
Update advanced/Scripts/webpage.sh 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2020-05-06 08:40:54 +01:00
Dan Schaper
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
DL6ER
fdaf815f42
Merge pull request #3203 from MichaIng/patch-1 
Failsafe checks for available APT package
 2020-05-05 10:27:08 +02:00
DL6ER
988b1ff02f
Merge pull request #3204 from MichaIng/patch-3 
Revert using hardcoded php-intl meta package
 2020-05-05 10:24:56 +02:00
Dan Schaper
df13b9c32a
Merge pull request #3283 from pi-hole/tweak/remove_firewall_config 
Remove configureFirewall function, the call to it, and related tests
 2020-05-02 10:06:31 -07:00
Adam Warner
4710963ccf
Merge pull request #3312 from subdavis/development 
Remove dead code
 2020-05-01 16:43:34 +01:00
Brandon Davis
1540e5bfda Remove dead code 
Signed-off-by: Brandon Davis <git@subdavis.com>
 2020-05-01 07:52:33 -04:00