Commit graph

5982 commits

Author SHA1 Message Date
dependabot[bot]
ff2c2290c7
Bump tox from 4.10.0 to 4.11.1 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.10.0 to 4.11.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.10.0...4.11.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-02 10:27:10 +00:00
Christian König
c33963b250
Check for valid OS via IPv4 and IPv6
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-27 15:11:47 +02:00
Christian König
eca84e0986
Remove user agent when downloading adlists
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-27 14:59:47 +02:00
yubiuser
487a64abec
Bump tox from 4.9.0 to 4.10.0 in /test (#5374) 2023-08-26 14:44:00 +02:00
yubiuser
1330aa8f1c
Bump actions/checkout from 3.5.3 to 3.6.0 (#5375) 2023-08-26 14:43:21 +02:00
dependabot[bot]
53e8127781
Bump actions/checkout from 3.5.3 to 3.6.0
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0.
- [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/v3.5.3...v3.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-26 11:33:09 +00:00
dependabot[bot]
e65b171aea
Bump tox from 4.9.0 to 4.10.0 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.9.0 to 4.10.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.9.0...4.10.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-26 11:24:09 +00:00
yubiuser
268a5dac40
Bump pytest-testinfra from 8.1.0 to 9.0.0 in /test (#5373) 2023-08-26 13:23:31 +02:00
dependabot[bot]
1afc96c055
Bump pytest-testinfra from 8.1.0 to 9.0.0 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 8.1.0 to 9.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/8.1.0...9.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-08-26 10:46:28 +00:00
yubiuser
18c9ae64b4
Bump tox from 4.7.0 to 4.9.0 in /test (#5364) 2023-08-19 15:33:31 +02:00
dependabot[bot]
43882693a5
Bump tox from 4.7.0 to 4.9.0 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.7.0 to 4.9.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.7.0...4.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-19 10:19:26 +00:00
Christian König
ee4eb8db20
chmod +x
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-13 22:26:44 +02:00
Christian König
8e0a40e717
Use api.sh within query.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-13 22:24:05 +02:00
yubiuser
052f9763b5
Bump tox from 4.6.4 to 4.7.0 in /test (#5359) 2023-08-12 13:24:30 +02:00
dependabot[bot]
bd55b2e566
Bump tox from 4.6.4 to 4.7.0 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.4 to 4.7.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.6.4...4.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-12 10:25:00 +00:00
Christian König
2227a2c569
Add API functions
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-09 21:25:50 +02:00
yubiuser
48dd045d91
Remove webpage.sh (#5357) 2023-08-07 23:17:41 +02:00
Christian König
3c693c1da5
Apply suggestions from code review
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-06 12:04:55 +02:00
Christian König
7bb0ca59d1
Remove traces of /run/pihole
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-05 14:54:09 +02:00
Christian König
587a2a1c04
# allow all users to enter der directories
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 23:52:53 +02:00
Christian König
c360743d41
Re-add file/folder permissions
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 21:12:40 +02:00
Christian König
8ef8a27583
Remove webpage.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 20:04:45 +02:00
Christian König
a3ea2cd8c3
User pihole should be allowed to edit all its files
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-04 19:32:19 +02:00
Christian König
5ae0405446
Ensure pihole-FTL can write custom.list
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-03 20:46:01 +02:00
Adam Warner
eda83a4141
If ${USER} variable is blank, then populate it with whoami (#5341) 2023-07-18 09:12:25 +01:00
Adam Warner
03a1f4370a
Merge development -> development-v6 (#5345) 2023-07-18 09:11:55 +01:00
Adam Warner
f270642d67
Merge branch 'development' into development-v6-merge-dev
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-18 08:15:40 +01:00
DL6ER
2a03671fb9
Reinstall gravity cleanup on error
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
DL6ER
375d4d9bc1
Add type as new field of view vw_adlist
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
DL6ER
35512c4dc9
Fix adlist.list migration step failing during tests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
DL6ER
00cbb8bc8a
Add antigravity support to gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-18 08:13:36 +01:00
Adam Warner
6edd6a4d55
if ${USER} variable is blank, then populate it with whoami
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-18 08:11:48 +01:00
Adam Warner
aec852fa51
Update test dependencies (v6) (#5344) 2023-07-18 08:11:37 +01:00
Adam Warner
e42c692ec7
Drop docker-compose from requirements.txt, it's not used. This was the only thing preventing us from using pyyaml 6.0.1 which fixes issues we were seeing with tests not running (https://github.com/yaml/pyyaml/pull/702)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-18 08:04:33 +01:00
Adam Warner
ab2aea7bbf
Bump tox from 4.6.2 to 4.6.4 in /test (#5339) 2023-07-16 22:52:26 +01:00
dependabot[bot]
8dd8f989ab
Bump tox from 4.6.2 to 4.6.4 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.2 to 4.6.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.6.2...4.6.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-07-16 21:44:31 +00:00
Adam Warner
762256a71b
Bump pytest from 7.3.2 to 7.4.0 in /test (#5340) 2023-07-16 22:43:43 +01:00
Adam Warner
78cd440a61
Bump actions/setup-python from 4.6.1 to 4.7.0 (#5338) 2023-07-16 22:42:53 +01:00
Adam Warner
30661fedcb
Sync master back into development (#5337) 2023-07-16 22:36:32 +01:00
dependabot[bot]
a3955a7ebb
Bump pytest from 7.3.2 to 7.4.0 in /test
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.2 to 7.4.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.3.2...7.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-16 21:36:15 +00:00
dependabot[bot]
e295997d51
Bump actions/setup-python from 4.6.1 to 4.7.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-16 21:36:02 +00:00
Adam Warner
8495565a6f
Update dependabot.yml (#5334) 2023-07-16 22:35:34 +01:00
Adam Warner
cefbfdf2a4
Bump actions/setup-python from 4.6.1 to 4.7.0 (#5336) 2023-07-16 22:24:01 +01:00
dependabot[bot]
91dabc574d
Bump actions/setup-python from 4.6.1 to 4.7.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-15 10:30:37 +00:00
Adam Warner
924de1d9ed
Update dependabot.yml
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-11 23:51:28 +01:00
yubiuser
60a7c50120
Bump tox from 4.6.3 to 4.6.4 in /test (#5332) 2023-07-08 14:55:31 +02:00
dependabot[bot]
a01d31e25d
Bump tox from 4.6.3 to 4.6.4 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.3 to 4.6.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.6.3...4.6.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-07-08 10:15:54 +00:00
DL6ER
2d4d9078c4
Add /var/log/pihole/webserver.log to the logrotate scripts (#5329) 2023-07-06 19:27:49 +02:00
DL6ER
64319fa96e
Add /var/log/pihole/webserver.log to the logrotate scripts. While it may be empty for most, it can grow quickly if either API or TLS debugging is enabled (it can quickly reach several hundreds of MB per day when debugging TLS)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-07-05 22:11:56 +01:00
Adam Warner
047017dc6a
Set new gravity database version to 16 (#5328) 2023-07-04 08:32:50 +01:00