Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-05 07:00:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
5058 commits 16 branches 116 tags 34 MiB
Commit graph

5058 commits

This branch
This branch
All branches
Author SHA1 Message Date
BeachDev
933199634b
Merge pull request #12 from BeachDev/snyk-fix-1b1af9ead3aefcf8e5009ab17ab5eee1 
[Snyk] Security upgrade buildpack-deps from impish-scm to impish-curl
 2022-02-21 09:35:31 -05:00
snyk-bot
b9180cd35d
fix: test/_debian_11.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-WGET-1736370
 2022-02-21 14:35:21 +00:00
BeachDev
6377876fcc
Merge pull request #11 from BeachDev/snyk-fix-59a11c30b4bf6981f3ee864501fa2699 
[Snyk] Security upgrade buildpack-deps from bionic-scm to impish-scm
 2022-02-21 09:34:56 -05:00
snyk-bot
2ef669af85
fix: test/_ubuntu_18.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU1804-SUBVERSION-1073774
- https://snyk.io/vuln/SNYK-UBUNTU1804-SUBVERSION-456086
- https://snyk.io/vuln/SNYK-UBUNTU1804-SUBVERSION-456090
- https://snyk.io/vuln/SNYK-UBUNTU1804-SUBVERSION-456090
- https://snyk.io/vuln/SNYK-UBUNTU1804-WGET-1278731
 2022-02-21 14:34:29 +00:00
BeachDev
0b80ab6435
Merge pull request #10 from BeachDev/snyk-fix-f36e3bdf40ccef407d4b1fe3e4d8c1ef 
[Snyk] Security upgrade buildpack-deps from impish-scm to impish-curl
 2022-02-21 09:33:56 -05:00
snyk-bot
4e3f5d5d3e
fix: test/_ubuntu_16.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-WGET-1736370
 2022-02-21 14:33:45 +00:00
BeachDev
0fb3de9aab
Merge pull request #9 from BeachDev/snyk-fix-9a374d10efd3991998b5ad46914764de 
[Snyk] Security upgrade buildpack-deps from impish-scm to impish-curl
 2022-02-21 09:33:15 -05:00
snyk-bot
356ad3c275
fix: test/_debian_10.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-WGET-1736370
 2022-02-21 14:33:04 +00:00
BeachDev
664e352b86
Merge pull request #8 from BeachDev/snyk-fix-4af0f01a6a6baa16968b09a80f32a748 
[Snyk] Security upgrade buildpack-deps from bullseye-scm to impish-scm
 2022-02-21 09:32:32 -05:00
snyk-bot
dcd68591c3
fix: test/_debian_11.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN11-EXPAT-2331802
- https://snyk.io/vuln/SNYK-DEBIAN11-EXPAT-2331808
- https://snyk.io/vuln/SNYK-DEBIAN11-EXPAT-2331811
- https://snyk.io/vuln/SNYK-DEBIAN11-EXPAT-2359255
- https://snyk.io/vuln/SNYK-DEBIAN11-EXPAT-2384928
 2022-02-21 14:32:05 +00:00
BeachDev
55dd97c73c
Merge pull request #7 from BeachDev/snyk-fix-d28318e5bfb3f2f8f0e4e1e554555bef 
[Snyk] Security upgrade buildpack-deps from buster-scm to impish-scm
 2022-02-21 09:31:12 -05:00
snyk-bot
7def914e59
fix: test/_debian_10.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN10-EXPAT-2331803
- https://snyk.io/vuln/SNYK-DEBIAN10-EXPAT-2331813
- https://snyk.io/vuln/SNYK-DEBIAN10-EXPAT-2331818
- https://snyk.io/vuln/SNYK-DEBIAN10-EXPAT-2359258
- https://snyk.io/vuln/SNYK-DEBIAN10-EXPAT-2384929
 2022-02-21 14:31:00 +00:00
BeachDev
8137f4f53f
Merge pull request #6 from BeachDev/snyk-fix-788b6a2d5efab8a9269770185bccd6d9 
[Snyk] Security upgrade buildpack-deps from xenial-scm to impish-scm
 2022-02-21 09:30:17 -05:00
snyk-bot
35c13481a4
fix: test/_ubuntu_16.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU1604-CURL-1613106
- https://snyk.io/vuln/SNYK-UBUNTU1604-GIT-1584921
- https://snyk.io/vuln/SNYK-UBUNTU1604-LIBGCRYPT20-1585790
- https://snyk.io/vuln/SNYK-UBUNTU1604-OPENSSL-1569467
- https://snyk.io/vuln/SNYK-UBUNTU1604-SYSTEMD-1320131
 2022-02-21 14:30:10 +00:00
BeachDev
823ee4fdab
Merge pull request #5 from BeachDev/snyk-fix-159e65ceb7e2ada9cba135dc75e0ba6d 
[Snyk] Security upgrade buildpack-deps from impish-scm to impish-curl
 2022-02-21 09:29:31 -05:00
snyk-bot
71860d899c
fix: test/_ubuntu_20.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-WGET-1736370
 2022-02-21 14:29:23 +00:00
BeachDev
2e4e32d408
Merge pull request #4 from BeachDev/snyk-fix-a5b70e90f5741e3e79cfc4e7c2c90209 
[Snyk] Security upgrade buildpack-deps from focal-scm to impish-scm
 2022-02-21 09:28:45 -05:00
snyk-bot
64abbe70b5
fix: test/_ubuntu_20.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU2004-UTILLINUX-2387723
- https://snyk.io/vuln/SNYK-UBUNTU2004-UTILLINUX-2387723
- https://snyk.io/vuln/SNYK-UBUNTU2004-UTILLINUX-2387728
- https://snyk.io/vuln/SNYK-UBUNTU2004-UTILLINUX-2387728
- https://snyk.io/vuln/SNYK-UBUNTU2004-UTILLINUX-2387728
 2022-02-21 14:28:32 +00:00
BeachDev
b8da4d7ce4
Merge pull request #3 from BeachDev/snyk-fix-d250edfa076e4aa5ffe1d101dbcc892c 
[Snyk] Security upgrade centos from 7 to latest
 2022-02-21 09:27:55 -05:00
snyk-bot
23fc945e2d
fix: test/_centos_7.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-CENTOS7-GLIB2-2182590
- https://snyk.io/vuln/SNYK-CENTOS7-NSS-2308137
- https://snyk.io/vuln/SNYK-CENTOS7-NSSSYSINIT-2308141
- https://snyk.io/vuln/SNYK-CENTOS7-NSSTOOLS-2308139
- https://snyk.io/vuln/SNYK-CENTOS7-OPENSSLLIBS-2178963
 2022-02-21 14:27:48 +00:00
BeachDev
cb4801bbcc
Merge pull request #2 from BeachDev/snyk-fix-3617fdfe7cb6018fa2b05a8df6f71e83 
[Snyk] Security upgrade buildpack-deps from impish-scm to impish-curl
 2022-02-21 09:27:21 -05:00
snyk-bot
c225c28560
fix: test/_debian_9.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387725
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-UTILLINUX-2387730
- https://snyk.io/vuln/SNYK-UBUNTU2110-WGET-1736370
 2022-02-21 14:27:11 +00:00
BeachDev
4035e45576
Merge pull request #1 from BeachDev/snyk-fix-cc55ad37ad9a98895eee873a79f40915 
[Snyk] Security upgrade buildpack-deps from stretch-scm to impish-scm
 2022-02-21 09:26:32 -05:00
snyk-bot
327ac07446
fix: test/_debian_9.Dockerfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN9-EXPAT-2384931
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON27-1063180
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON27-1063180
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON27-1063180
- https://snyk.io/vuln/SNYK-DEBIAN9-PYTHON27-1063180
 2022-02-21 14:26:00 +00:00
Adam Warner
9be5199f7c
remove the CONTENT_COMPARISON setting (defaults to false) 2022-02-20 12:39:58 +00:00
Adam Warner
6ffa2ba1b2
Merge pull request #4547 from pi-hole/development 
Pi-hole Core v5.9
 2022-02-12 20:04:20 +00:00
Adam Warner
e9250d62c5
Merge pull request #4598 from pi-hole/alt-4597 
Use case insensitive deletion when removing custom CNAME/DNS records
 2022-02-04 21:26:33 +00:00
Adam Warner
08999bf315
Use case insensitive deletion when removing custom CNAME/DNS records in case of manual entries with mixed case having been added 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-02-04 21:16:02 +00:00
Adam Warner
2bd670a3dd
Merge pull request #4582 from lschloetterer/patch-1 
add parameter to set filename for teleporter
 2022-02-04 20:44:49 +00:00
Adam Warner
f342b2c9f6
Merge pull request #4489 from pi-hole/tweak/manpages 
Remove pihole-FTL.conf manpage
 2022-02-04 20:36:32 +00:00
Lukas Schlötterer
2a0bb5b9ee Create second entry for teleporter and adjust spacing 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-04 21:29:23 +01:00
yubiuser
c3c5342b48
Fix reviewer's comment 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2022-02-04 21:11:54 +01:00
Christian König
d7d8e9730b Remove pihole-FTL.conf.5 from automated tests 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-04 20:43:47 +01:00
Christian König
7c60ee8df1 Remove pihole-FTL.conf man page 
Signed-off-by: Christian König <ckoenig@posteo.de>

Remove double https://

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-04 20:43:47 +01:00
Adam Warner
ee9f4856a2
Merge pull request #4596 from pi-hole/long-live-centos8-stream 
Switch from centos8 to centos8:stream base image for centos 8 tests
 2022-02-03 19:05:16 +00:00
Adam Warner
444526ad58
Switch from centos8 to centos8:stream base image for centos 8 tests 2022-02-03 18:43:19 +00:00
DL6ER
844c4dcdc8
Merge pull request #4584 from pi-hole/fix/gravity_internal_sqlite3 
Replace calls to sqlite3 by calls to pihole-FTL sqlite3
 2022-02-03 05:45:04 +01:00
Lukas Schlötterer
881d92632c
add hint for custom teleporter filename to help function 
Signed-off-by: Lukas Schlötterer <80917404+lschloetterer@users.noreply.github.com>
 2022-02-01 09:41:57 +01:00
DL6ER
76d4e1209f
Merge pull request #4585 from pi-hole/tweak/sed-add-if-not-exists 
Replace value for BLOCKING_ENABLED, add if it does not already exist
 2022-02-01 07:45:34 +01:00
DL6ER
d956498c8c
Merge pull request #4575 from pi-hole/fix/tag_update 
Fix updating based on tags on older git versions by doing a full fetch
 2022-02-01 07:44:23 +01:00
DL6ER
e09dd56807
Remove RPM package sqlite as well 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-02-01 07:38:57 +01:00
DL6ER
30ec1c94cc
Merge pull request #4593 from pi-hole/master 
sync: master to development
 2022-02-01 07:37:47 +01:00
Adam Warner
5d68dac90e
Merge pull request #4588 from pi-hole/stale 
Fix stale label to stale
 2022-01-31 19:25:28 +00:00
Adam Warner
77e5121d43
Split new function out into a separte utility script and add a test for it. Can be used in future to organise re/commonly-used code 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-30 23:05:28 +00:00
DL6ER
74d7d10554
Orphans need to be deleted in the old database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 21:09:24 +01:00
Christian König
2f4c4d9176
Fix stale label to stale 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-30 20:13:10 +01:00
Adam Warner
1dd9d55d82
Replace value for BLOCKING_ENABLED (and QUERY_LOGGING, for consistency) and if value that we are trying to replace does not exist, add it to the end of the file. 
Co-authored-by: MichaIng <micha@dietpi.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-30 15:53:03 +00:00
DL6ER
8cbffa179d
Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 11:18:17 +01:00
DL6ER
5bb79de70b
Clean possible leftovers in domainlist_by_group, adlist_by_group, and client_by_group before copying from database base to avoid foreign key violations. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 10:38:24 +01:00
DL6ER
534f9a63bf
Copy database tables earlier into the new gravity database to avoid foreign key contraint violations when adding gravity entries refering to an empty adlist table 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 10:36:20 +01:00