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-22 14:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
6355 commits 8 branches 109 tags 27 MiB
Commit graph

6355 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
32a741b5c7
We do not follow 308 but FTL also doesn't suggest it 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-12-02 22:42:36 +01:00
yubiuser
bbbb4609d2
Bump tox from 4.11.3 to 4.11.4 in /test (#5506) 2023-12-02 14:23:13 +01:00
yubiuser
e364349901
Bump tox from 4.11.3 to 4.11.4 in /test (#5507) 2023-12-02 14:22:53 +01:00
dependabot[bot]
f5fe550a2e
Bump tox from 4.11.3 to 4.11.4 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.11.3 to 4.11.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.11.3...4.11.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-02 10:35:21 +00:00
dependabot[bot]
bfc824f2ff
Bump tox from 4.11.3 to 4.11.4 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.11.3 to 4.11.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.11.3...4.11.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-02 10:04:50 +00:00
DL6ER
29d010dc2c
Use files.gravity_tmp as temporary directory for the intermediate lists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-12-01 10:21:13 +01:00
DL6ER
96bf07863f
Use CHAOS TXT local.api.txt instead of trying to parse pihole-FTL --config webserver.ports 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-12-01 09:10:06 +01:00
yubiuser
62f9694aa4
Bump pytest-xdist from 3.4.0 to 3.5.0 in /test (#5500) 2023-12-01 00:15:20 +01:00
yubiuser
4523f078bb
Bump pytest-xdist from 3.4.0 to 3.5.0 in /test (#5501) 2023-12-01 00:13:41 +01:00
DL6ER
6016131280
Ensure we also check the last port 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-28 22:59:49 +01:00
DL6ER
974fea592d
Iterate over ports, skip redirected ports 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-28 00:05:55 +01:00
dependabot[bot]
9d57f64937
Bump pytest-xdist from 3.4.0 to 3.5.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.4.0...v3.5.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-25 10:58:21 +00:00
dependabot[bot]
1276242a4e
Bump pytest-xdist from 3.4.0 to 3.5.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.4.0...v3.5.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-25 10:16:35 +00:00
DL6ER
a6565bf9a1
Support special webserver.port ports ending in "s" (secure) and "r" (redirect) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-23 22:07:31 +01:00
DL6ER
c785667efe
Trim leading and trailing spaces and tabs in upstream servers (if any) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-23 09:56:43 +01:00
DL6ER
cc333f79cc
Check if this domain is blocked by Pi-hole but only if the domain is not a local file or empty 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-22 21:10:22 +01:00
DL6ER
df7633bd1b
Add missing value for ${gravityDBfile_default} 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-22 21:08:06 +01:00
DL6ER
4efcdf1189
Add missing double quotes to prevent globbing and word splitting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-22 21:06:09 +01:00
DL6ER
f16cf71781
${PIHOLE_DNS_1} is gone, use the first server from pihole-FTL --config dns.upstreams instead 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-22 21:04:46 +01:00
DL6ER
19d3489bcb
gravity_DownloadBlocklistFromUrl needs ${domain} but it was declared local before and was not passed as argument, making gravity currently depend on undefined behavior. It seems to be working well in the vast majority of cases, however, it seems we have at least one report where it is not working. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-22 20:56:23 +01:00
yubiuser
2338c9e916
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test (#5490) 2023-11-18 12:31:11 +01:00
yubiuser
536d170009
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test (#5492) 2023-11-18 12:30:21 +01:00
dependabot[bot]
f4b67065cc
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.3.1 to 3.4.0.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.3.1...v3.4.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-18 10:55:51 +00:00
yubiuser
2b79abb948
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test (#5491) 2023-11-18 11:55:06 +01:00
dependabot[bot]
2e73eb36ef
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 9.0.0 to 10.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/9.0.0...10.0.0)

---
updated-dependencies:
- dependency-name: pytest-testinfra
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-18 10:54:16 +00:00
yubiuser
271884c4bb
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test (#5493) 2023-11-18 11:53:28 +01:00
dependabot[bot]
3c4f217876
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.3.1 to 3.4.0.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.3.1...v3.4.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-18 10:27:10 +00:00
dependabot[bot]
ab09233753
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 9.0.0 to 10.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/9.0.0...10.0.0)

---
updated-dependencies:
- dependency-name: pytest-testinfra
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-18 10:17:34 +00:00
yubiuser
af9b8df118
Improve v6 debug log and remove leftovers (#5481) 2023-11-14 00:04:16 +01:00
Christian König
b61e8be3b4
Address reviewer's comment 
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 23:04:44 +01:00
Christian König
54ab71d817
Don't use hardcoded ports to check for 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 23:04:44 +01:00
Christian König
e7c89ce25f
No need to pass a default value to get_ftl_conf_value() 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 23:04:44 +01:00
Christian König
d3813c4be5
Update check for required ports 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 23:04:44 +01:00
Christian König
d854eb1a97
Add lshw to Pi-hole deps 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 23:04:44 +01:00
Christian König
86aa6b1df6
Improve v6 debug log and remove leftovers 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 23:04:44 +01:00
yubiuser
1da36bd4e7
Move custom.list to /hosts/custom.list (#5488) 2023-11-13 22:58:16 +01:00
Christian König
f65b126433
Move custom.list to /hosts/custom.list 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-13 21:37:41 +01:00
Christian König
766cb26af5
Drop Fedora 36 and add Fedora 39 to the test suite 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-07 22:24:34 +01:00
DL6ER
e8884083ef
Apply suggestions from code review 
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
 2023-11-07 08:58:31 +01:00
DL6ER
e3c6f162d8
Apply suggestions from code review 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: DL6ER <DL6ER@users.noreply.github.com>
 2023-11-07 08:57:56 +01:00
Christian König
de6e61705e
Remove local.list and openVPN traces 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-06 21:40:32 +01:00
DL6ER
834e52f15d
pihole -d: Include pihole.toml only once (#5478) 2023-11-06 19:46:33 +01:00
DL6ER
0b4131189d
Migrate Pi-hole created files out of /etc/dnsmasq.d into a pihole owned directory 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-06 14:55:34 +01:00
DL6ER
72c972175d
Remove left-over parts of setupVars processing and only include pihole.toml once 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-11-06 13:53:08 +01:00
yubiuser
2746ee3ae9
Tweak help text of pihole setpassword (#5476) 2023-11-05 23:24:31 +01:00
Christian König
bc96d3b0a9
Tweak help text of pihole setpassword 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-05 21:18:46 +01:00
DL6ER
395110f92f
When setting a blank password, use webserver.api.password instead of webserver.api.pwhash (#5465) 2023-11-04 17:43:09 +01:00
yubiuser
758ace57c0
Check for valid OS via IPv4 and IPv6 (#5305) 2023-11-04 08:02:38 +01:00
yubiuser
4c129afb10
Start counting at postion 1 (#5470) 2023-11-02 07:00:23 +01:00
Christian König
ced1c5d50b Start counting at postion 1 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-11-01 21:57:36 +01:00