ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
6,426 Commits 10 Branches 126 Tags
aedb2f0a9331fea96d9e0659c6fdfbdc03a201a8
Commit Graph

6426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner eb7daf4d2c Fix file permission check in gravity.sh. Remove quotes that were added after complaints from shellcheck, this stopped the comparisson from working 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-03-27 19:12:59 +00:00
Adam Warner 7442454d32 Sync master back into development (#5616) 2024-03-27 18:25:47 +00:00
Adam Warner 3c7a6ce535 Release 5.18 (#5615) v5.18 2024-03-27 18:11:12 +00:00
Adam Warner f3af03174e Merge pull request from GHSA-95g6-7q26-mp9x 
Only use local files (file://) when they have explicit permissions a+r
 2024-03-27 18:02:44 +00:00
dependabot[bot] 472602ffb9 Bump tox from 4.14.1 to 4.14.2 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.14.1 to 4.14.2.
- [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.14.1...4.14.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-23 10:52:31 +00:00
dependabot[bot] 7aab7d9849 Bump tox from 4.14.1 to 4.14.2 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.14.1 to 4.14.2.
- [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.14.1...4.14.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-23 10:34:48 +00:00
dependabot[bot] 08dd321f73 Bump pytest from 8.0.2 to 8.1.1 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.2 to 8.1.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.0.2...8.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-16 10:44:52 +00:00
dependabot[bot] 58a1e85826 Bump actions/checkout from 4.1.1 to 4.1.2 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.1...v4.1.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-16 10:21:49 +00:00
dependabot[bot] eb23fbf879 Bump actions/checkout from 4.1.1 to 4.1.2 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.1...v4.1.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-16 10:08:27 +00:00
Dominik 206cf9c4ea Fix edge-case where an adlist domain is blocked (#5571) 2024-03-16 09:08:03 +01:00
Dominik 71b17294bc Verify remote FTL checksum (#5603) 2024-03-11 19:14:20 +01:00
DL6ER 82a83c497d Reduce code-duplication 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-10 21:18:13 +01:00
DL6ER 2fd0de4743 Verify that we actually downloaded a valid checksum before comparing it to the local one. This covers situations where downloading the checksum from remote might have failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-10 08:43:37 +01:00
Dominik dedaf5432e Highlight "### CHANGED" strings in the debug log of pihole.toml (#5601) 2024-03-09 21:49:29 +01:00
DL6ER c02401b81e Highlight "### CHANGED" strings in the debug log of pihole.toml 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-09 16:57:28 +01:00
yubiuser eaa878e7a4 Bump tox from 4.13.0 to 4.14.1 in /test (#5602) 2024-03-09 12:03:35 +01:00
dependabot[bot] 8042d9e3fd Bump tox from 4.13.0 to 4.14.1 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.13.0 to 4.14.1.
- [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.13.0...4.14.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-09 10:21:53 +00:00
yubiuser cb4f6d4159 Bump tox from 4.13.0 to 4.14.1 in /test (#5600) 2024-03-09 11:12:22 +01:00
dependabot[bot] bfd8b572cb Bump tox from 4.13.0 to 4.14.1 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.13.0 to 4.14.1.
- [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.13.0...4.14.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-09 10:07:37 +00:00
DL6ER 8fb3a594eb Merge branch 'development-v6' into fix/gravity_domain 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-09 07:47:32 +01:00
DL6ER 9dd138b033 Only use local files (file://) when they have explicit permissions a+r 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-03-04 19:38:13 +01:00
Dominik 0635ea7455 Allow adlist duplicates (#5572) 2024-03-02 18:28:47 +01:00
yubiuser 0597128de8 Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test (#5579) 2024-03-02 12:56:52 +01:00
dependabot[bot] 0fdd959c7f Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.0.0 to 10.1.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/10.0.0...10.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-02 11:52:21 +00:00
yubiuser e03ddf5d41 Bump pytest from 8.0.0 to 8.0.2 in /test (#5598) 2024-03-02 12:51:31 +01:00
dependabot[bot] cb3e448b38 Bump pytest from 8.0.0 to 8.0.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.0.0...8.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-02 10:18:47 +00:00
yubiuser 6bb7d10a6d Bump pytest from 8.0.1 to 8.0.2 in /test (#5597) 2024-03-02 11:09:20 +01:00
dependabot[bot] fd1372df3e Bump pytest from 8.0.1 to 8.0.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.1 to 8.0.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.0.1...8.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-02 10:01:31 +00:00
yubiuser 760f903d12 Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test (#5583) 2024-02-24 13:53:55 +01:00
dependabot[bot] 07e6c0d250 Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.0.0 to 10.1.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/10.0.0...10.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-24 12:49:07 +00:00
yubiuser 48c1d5a3d2 Bump pytest from 8.0.0 to 8.0.1 in /test (#5582) 2024-02-24 13:48:06 +01:00
dependabot[bot] 3ed29f494b Bump pytest from 8.0.0 to 8.0.1 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.0.0...8.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-24 12:45:22 +00:00
yubiuser b57cf27103 Bump tox from 4.12.1 to 4.13.0 in /test (#5581) 2024-02-24 13:44:20 +01:00
yubiuser f5e6364f98 Bump tox from 4.12.1 to 4.13.0 in /test (#5584) 2024-02-24 13:43:34 +01:00
DL6ER ed1a6278b7 Merge branch 'development-v6' into new/migrate_dnsmasq_conf 2024-02-19 21:29:11 +01:00
dependabot[bot] b322f1e98b Bump tox from 4.12.1 to 4.13.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.12.1 to 4.13.0.
- [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.12.1...4.13.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-17 10:50:41 +00:00
dependabot[bot] 5b75cb1950 Bump tox from 4.12.1 to 4.13.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.12.1 to 4.13.0.
- [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.12.1...4.13.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-17 10:29:46 +00:00
DL6ER 9ff43040ec Add list type in pihole -q 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-02-13 09:58:29 +01:00
DL6ER 75fadb9b55 Adlists need to be grouped by both address and type to differentiate between anti-/gravity lists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-02-13 08:55:26 +01:00
DL6ER 1a59b407e0 Merge branch 'development-v6' into tweak/allow_adlist_dups 2024-02-13 07:47:30 +01:00
Dominik c771739f68 Fix gravity (#5573) 2024-02-12 06:42:04 +01:00
DL6ER bcb712b6e3 Fix accidential double -ni from one of the last PRs 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-02-11 21:07:15 +01:00
Adam Warner bb095bb209 Merge development into development-v6 (with merge conflicts resolved) (#5570) 2024-02-11 17:11:04 +00:00
DL6ER b5ab8ac198 Change UNIQUEness constraint from (address) to (address, type) in the adlist table. This will allow certain adlists to be associated to different groups. A possible scenario is an adlist meant to block a specific service (e.g. Twitter, Youtube, etc.). It can then either be used to ensure these services are really blocked on the devices of group A but will never be blocked on devices of group B. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-02-11 16:54:22 +01:00
DL6ER 8b3469cabc Merge branch 'development-v6' into development-v6-merge-development 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-02-11 16:41:41 +01:00
yubiuser aca7b31b83 Remove local.list and openVPN traces (#5480) 2024-02-10 06:16:00 +01:00
Dominik 8f36fdf11c Make IDs of anti-/gravity lists available in vw_(anti)gravity (#5526) 2024-02-09 20:52:29 +01:00
Adam Warner f193edd428 Merge branch 'development' into development-v6-merge-development (resolved conflicts) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-02-09 19:22:53 +00:00
yubiuser 3ba6ab5ec7 Bump pytest from 7.4.4 to 8.0.0 in /test (#5566) 2024-02-05 13:53:45 +01:00
dependabot[bot] f0878c0890 Bump pytest from 7.4.4 to 8.0.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.4 to 8.0.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.4...8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-04 21:39:17 +00:00