Commit graph

5838 commits

Author SHA1 Message Date
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
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
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
Adam Warner
c557f29db2
Set new gravity database version to 16, which was missed in 5459daa
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 23:01:27 +01:00
Adam Warner
04c3f7a603
Development -> development-v6 (#5321) 2023-06-18 22:21:11 +01:00
Adam Warner
85d256d53c
Switch to new branch name for FTL v6 development (#5319) 2023-06-18 22:17:39 +01:00
Adam Warner
ca66c1ea9c
Switch to new branch name for FTL v6 development
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 22:05:18 +01:00
Adam Warner
0fa5c62450
Add code to remove old lighttpd config files left over from v5. (#5314) 2023-06-18 21:53:07 +01:00
Adam Warner
a3bb3872bf
adlist table now contains 11 columns, not 10.
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 21:10:12 +01:00
Adam Warner
d637d2a7a5
Simplify nested if statements.
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 21:10:06 +01:00
Adam Warner
001f2012a2
Update automated install/basic-install.sh
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-06-18 15:45:30 +01:00
Adam Warner
c39cb8cfe0
Escape the sed command for removing a line in fed/centos lighttpd.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 15:45:30 +01:00
Adam Warner
d5013bfd6c
Add code to remove old lighttpd config files left over from v5. Web config is all dealt with by FTL now
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-18 15:45:30 +01:00
yubiuser
7bc1126978
Bump tox from 4.6.0 to 4.6.2 in /test (#5317) 2023-06-17 19:46:04 +02:00
dependabot[bot]
7a66083e68
Bump tox from 4.6.0 to 4.6.2 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.0 to 4.6.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.6.0...4.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-17 11:35:38 +00:00
yubiuser
17fffa4e49
Bump pytest from 7.3.1 to 7.3.2 in /test (#5318) 2023-06-17 13:35:00 +02:00
dependabot[bot]
3fd7b4ee24
Bump pytest from 7.3.1 to 7.3.2 in /test
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.1 to 7.3.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/7.3.1...7.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-17 10:59:42 +00:00
DL6ER
5459daa03d
Add abp_entries column (default 0) to the adlist table for newly created gravity databases. This updates the gravity database version to 16
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-15 09:36:17 +02:00
DL6ER
306df56203
Add tests for Debian 12 (#5312) 2023-06-11 08:46:59 +02:00
Christian König
117c15319d
Add tests for Debian 12
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-10 23:03:43 +02:00
yubiuser
b8419ba3c5
Bump tox from 4.5.2 to 4.6.0 in /test (#5311) 2023-06-10 14:14:59 +02:00
yubiuser
8347de1cc6
Bump actions/checkout from 3.5.2 to 3.5.3 (#5310) 2023-06-10 14:06:32 +02:00
dependabot[bot]
8e481e27da
Bump tox from 4.5.2 to 4.6.0 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.5.2 to 4.6.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.5.2...4.6.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-06-10 11:00:35 +00:00
dependabot[bot]
7d3f354dd7
Bump actions/checkout from 3.5.2 to 3.5.3
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 3.5.3.
- [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.2...v3.5.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-10 10:57:12 +00:00
DL6ER
e0d7e5df85
Install binutils as installer deps (needed to pick correct architecture for FTL)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-09 19:30:28 +02:00
DL6ER
913be6c349
Print detected CPU arch
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-09 19:01:14 +02:00
DL6ER
1c4e58efe3
Use exact architecture matching binaries where appropriate
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-09 15:53:02 +02:00
DL6ER
9c27e4766d
Decide which FTL architecture to pick by by installed architectures rather than by detected processor (this may be wrong in an emulated Docker environment)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-08 22:17:14 +02:00
Adam Warner
eb0bd026d7
Sync master back into development (#5296) 2023-06-04 22:16:58 +01:00
Adam Warner
7e95371fe8
Do not remove -all|exact when not surrounded by space in query.sh (#5300) 2023-06-04 22:16:35 +01:00
Adam Warner
499998c537
Remove option to set static IP address if DHCPCD is installed (#5111) 2023-06-04 22:09:04 +01:00
Christian König
8bf4ab0cd6
Remove option to set static IP address if DHCPCD is installed
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 22:59:44 +02:00
Christian König
088b2c2920
Do not remove -all|excat when not sourrounded by space in query.sh
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 22:57:31 +02:00
yubiuser
34a261e522
Bump tox from 4.5.1 to 4.5.2 in /test (#5304) 2023-06-04 22:15:36 +02:00
Christian König
ba3e290915
Fix shellcheck errors
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 21:21:48 +02:00
Christian König
53fb7ae0ef
Use shellcheck in smoke-tests. RIP stickler
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 21:06:44 +02:00
Christian König
366345e87e
Fix no_installs
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-04 20:31:48 +02:00
DL6ER
667418c71d
Use new FTL binary names
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-06-04 20:02:38 +02:00
dependabot[bot]
b0fa3795e9
Bump tox from 4.5.1 to 4.5.2 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.5.1 to 4.5.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.5.1...4.5.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-03 10:58:23 +00:00
Christian König
ec82aec55f
centos_common_support.py was removed
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-02 00:13:57 +02:00
Christian König
7da57c6acd
Don't check and install old FTL config file
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-02 00:08:50 +02:00
Christian König
0becc7615a
Run prestart
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 23:51:03 +02:00
Christian König
a4322c624f
Fix gravity in tests
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-06-01 22:00:40 +02:00