df9c60e351
Reduce code duplication in FTL arch detect tests.
...
Use parametrize to run the same test with different parameters for each arch we need to test.
Also include detection of unusupported in this test.
Create FTL_BRANCH constant to be used in functions (less places to remember to change it)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-01-08 18:26:59 +00:00
220c0675ef
As we do in other tests, specify `development-v6` branch of FTL is downloaded for the tests. We need to change this to `develoment` once v6 is released
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-01-07 21:03:48 +00:00
e14792bc48
Bump pytest from 7.4.3 to 7.4.4 in /test ( #5535 )
2024-01-06 11:14:28 +01:00
9c3578856f
Bump pytest from 7.4.3 to 7.4.4 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4.3 to 7.4.4.
- [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.3...7.4.4 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-01-06 10:02:39 +00:00
6e8029f69f
Bump github/codeql-action from 2 to 3 ( #5521 )
2023-12-16 17:42:03 +01:00
0cfcdc4b50
Bump github/codeql-action from 2 to 3
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/github/codeql-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-12-16 10:08:32 +00:00
719ce801f5
Add "-ni" to all sqlite3 invocations ( #5518 )
2023-12-10 10:17:48 +01:00
13676c40ca
Simplify pihole -v ( #5517 )
2023-12-09 23:21:52 +01:00
c3c31a1a60
Print version details automatically if not on master
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 23:14:58 +01:00
b333e30162
Remove version options from bash completion
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 23:14:58 +01:00
fe4d934a40
Simplify pihole -v
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 23:13:04 +01:00
a6c0d279b6
Remove obsolete sudo file ( #5514 )
2023-12-09 23:11:04 +01:00
c90a27c509
Add "-ni" to all sqlite3 invocations
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-12-09 23:06:50 +01:00
ac86ae1e4c
Bash completion ( #5516 )
2023-12-09 23:02:29 +01:00
6d02d4056f
Rename option --admin to --web in version function
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 22:01:30 +01:00
fe7299323c
Update bash_completion
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 21:40:32 +01:00
274d4c263c
Add bash-completion to PIHOLE_DEPS
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 21:23:39 +01:00
54186a63ee
Remove test for sudo file as well
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 21:04:56 +01:00
a87d1bbc4f
Remove pihole.sudo
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-09 21:04:56 +01:00
750fb66a8c
Bump actions/setup-python from 4.7.1 to 5.0.0 ( #5510 )
2023-12-09 18:46:19 +01:00
0b23b9b268
Bump actions/stale from 8.0.0 to 9.0.0 ( #5511 )
2023-12-09 18:45:25 +01:00
e49d7fa5f1
Bump actions/setup-python from 4.7.1 to 5.0.0
...
Bumps [actions/setup-python](https://github.com/actions/setup-python ) from 4.7.1 to 5.0.0.
- [Release notes](https://github.com/actions/setup-python/releases )
- [Commits](https://github.com/actions/setup-python/compare/v4.7.1...v5.0.0 )
---
updated-dependencies:
- dependency-name: actions/setup-python
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-12-09 17:39:42 +00:00
8a71e4253e
Bump actions/stale from 8.0.0 to 9.0.0
...
Bumps [actions/stale](https://github.com/actions/stale ) from 8.0.0 to 9.0.0.
- [Release notes](https://github.com/actions/stale/releases )
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/stale/compare/v8.0.0...v9.0.0 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-12-09 17:39:18 +00:00
2529fbeacd
Treat FTL return data as strings ( #5509 )
2023-12-09 18:35:14 +01:00
03637e9081
Use files.gravity_tmp as temporary directory for the intermediate lists ( #5504 )
2023-12-09 09:30:28 +01:00
159817b7e2
Use development-v6 as ftl branch for binary test
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-06 20:35:26 +01:00
2681835f94
Treat FTL return data as strings
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-06 00:23:15 +01:00
7f7ec13c82
Support special webserver.port ports ending in "s" (secure) and "r" (redirect) ( #5499 )
2023-12-04 23:48:08 +01:00
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
e364349901
Bump tox from 4.11.3 to 4.11.4 in /test ( #5507 )
2023-12-02 14:22:53 +01:00
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
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
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
62f9694aa4
Bump pytest-xdist from 3.4.0 to 3.5.0 in /test ( #5500 )
2023-12-01 00:15:20 +01:00
6016131280
Ensure we also check the last port
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-28 22:59:49 +01:00
974fea592d
Iterate over ports, skip redirected ports
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2023-11-28 00:05:55 +01:00
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
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
2338c9e916
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test ( #5490 )
2023-11-18 12:31:11 +01:00
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
2b79abb948
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test ( #5491 )
2023-11-18 11:55:06 +01:00
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
af9b8df118
Improve v6 debug log and remove leftovers ( #5481 )
2023-11-14 00:04:16 +01:00
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
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
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
d3813c4be5
Update check for required ports
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
d854eb1a97
Add lshw to Pi-hole deps
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-13 23:04:44 +01:00
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
1da36bd4e7
Move custom.list to /hosts/custom.list ( #5488 )
2023-11-13 22:58:16 +01:00
Adam Warner
yubiuser
dependabot[bot]
Dominik
DL6ER