Commit graph

6431 commits

Author SHA1 Message Date
yubiuser
0ad2a79624
Apply suggestions from code review
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: yubiuser <ckoenig@posteo.de>
2024-09-06 21:20:36 +02:00
yubiuser
e291a9f7e0
It's Adguard not ABP
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: yubiuser <ckoenig@posteo.de>
2024-09-05 13:42:10 +02:00
Christian König
cffb3117d4
Remove lines containing ABP JavaScript rules from adlists
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-04 22:32:03 +02:00
yubiuser
1789b1ce99
Account for renaming of devel branch on web repo (#5753) 2024-09-04 22:05:12 +02:00
Christian König
333764a7c1
Account for renaming of devel branch on web repo
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-04 21:59:43 +02:00
yubiuser
915352aefb
Fix risk of popd without a pushd (#5701) 2024-09-04 21:46:21 +02:00
yubiuser
c911bf30ab
Tweak/gravity dns (#5752) 2024-09-04 21:45:32 +02:00
SkyLined
fc73cee156
Fix risk of popd without a pushd
`pushd` was inside if, `popd` was outside; there was a risk of not doing a `pushd` and only doing a `popd`.

Signed-off-by: SkyLined <cojmpjum_github.com@sxd.be>
2024-09-04 20:33:54 +02:00
Dominik
59e25d0283
Wait after restarting FTL before trying to check version (#5613) 2024-09-04 20:17:15 +02:00
Christian König
f80efa51aa
Wait until DNS resolution is available
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-03 23:32:41 +02:00
Christian König
ba2d10c65e
DNS check in gravity should not check for FTL as it might not be the host's name server
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-03 23:03:59 +02:00
Christian König
a57d539098
Remove leftover DNS check via dig as it now only doubles what we already have with getent hosts
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-03 23:02:15 +02:00
Christian König
50dcd8d62f
Add fallback option for OS check without hard-coded nameserver
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-03 22:31:13 +02:00
yubiuser
a965afa249
Remove obsolet Debian 10 (#5707) 2024-09-02 23:56:07 +02:00
Christian König
cd7226d5e9
Remove obsolet Debian 10
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-02 23:52:14 +02:00
Adam Warner
f2cb6e35ed
Sync master back into development (#5750) 2024-09-02 22:28:41 +01:00
Adam Warner
3df0a6a996
remove development-v6 references from dependabot yml (#5749) 2024-09-02 22:26:11 +01:00
Adam Warner
76d7863270
remove development-v6 references from dependabot yml
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 22:22:24 +01:00
yubiuser
e566338a79
Bump actions/setup-python from 5.1.1 to 5.2.0 (#5742) 2024-09-02 22:34:06 +02:00
dependabot[bot]
f66707bd3e
Bump actions/setup-python from 5.1.1 to 5.2.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.1.1 to 5.2.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5.1.1...v5.2.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>
2024-09-02 20:30:11 +00:00
Adam Warner
dcc057cd1f
Development v6 (#5100) 2024-09-02 21:04:41 +01:00
yubiuser
f277f5d202
Disable SELINUX on CentOS 9 test dockerfile v5 (#5744) 2024-09-02 20:15:40 +02:00
Dominik
80143325e8
Fix pihole status on not-ready states (#5747) 2024-09-02 19:18:05 +02:00
DL6ER
bcef4f0c97
pihole status should return (= exit) early on error instead of continuing the script
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-09-02 18:59:42 +02:00
Adam Warner
1d7071fb19
Merge branch 'development' into development-v6 2024-09-02 17:29:59 +01:00
DL6ER
b4444023a2 Wait after restarting FTL before trying to check version
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-09-02 15:54:27 +02:00
Dominik
4209e7dee8
Disable SELINUX on CentOS 9 test dockerfile (#5743) 2024-09-02 15:54:15 +02:00
Christian König
632d8af4b0
Disable SELINUX on CentOS 9 test dockerfile
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-01 22:35:23 +02:00
Christian König
5e69078ed1
Disable SELINUX on CentOS 9 test dockerfile
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-01 22:30:45 +02:00
yubiuser
bd9915105a
Update existing logrotate files to inlcude webserver.log (#5738) 2024-08-28 08:48:44 +02:00
Christian König
a21b4c5203 Update existing logrotate files to inlcude webserver.log
Signed-off-by: Christian König <github@yubiuser.dev>
2024-08-28 08:46:16 +02:00
Dominik
e3fc5cc8f2
Make the help text of "pihole checkout [what] [branch]" more colorful (#5734) 2024-08-28 08:43:11 +02:00
Dominik
c26b043c58
Add pihole api [endpoint] callback suitable for local API requests (#5736) 2024-08-28 08:36:39 +02:00
Adam Warner
8b078f67b8
Add missing creation of table antigravity in migration script 16 to 17 (#5737) 2024-08-27 16:30:09 +01:00
Adam Warner
cfbf3f61cd
Update advanced/Scripts/database_migration/gravity/16_to_17.sql
Co-authored-by: Dominik <DL6ER@users.noreply.github.com>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2024-08-26 21:30:12 +01:00
DL6ER
e8582f7740
Add pihole -h and autocompletion entry
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-08-26 19:44:42 +02:00
DL6ER
9e9c985245
FTL checkout: Check for availability of branches before trying to download from the webserver. Also, fix check_download_exists() possibly killing the script on non-availability of requested branches
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-08-26 06:11:42 +02:00
DL6ER
a302d7b5d7
Make the help text of "pihole checkout [what] [branch]" more colorful
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-08-26 05:22:15 +02:00
Adam Warner
72afa1073d
Add missing creation of table antigravity in migration script 16 to 17
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-08-25 21:47:07 +01:00
DL6ER
b304562c8e
Add session details to API command output
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-08-24 10:39:12 +02:00
DL6ER
8e4fc27168
Add pihole api [endpoint] callback suitable for local API requests
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-08-24 10:06:48 +02:00
yubiuser
7206569b1d
Fix setting query logging and privacy level (#5724) 2024-08-20 07:18:15 +02:00
Christian König
fc156f521c Fix setting query logging and privacy level
Signed-off-by: Christian König <github@yubiuser.dev>
2024-08-19 20:58:34 +02:00
yubiuser
4972cc6fdc
Bump tox from 4.17.1 to 4.18.0 in /test (#5731) 2024-08-17 12:41:32 +02:00
dependabot[bot]
f6681f75fb
Bump tox from 4.17.1 to 4.18.0 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.17.1 to 4.18.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.17.1...4.18.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-08-17 10:39:02 +00:00
yubiuser
c672b66eb4
Bump tox from 4.17.1 to 4.18.0 in /test (#5730) 2024-08-17 12:11:07 +02:00
dependabot[bot]
5024a98a4f
Bump tox from 4.17.1 to 4.18.0 in /test
Bumps [tox](https://github.com/tox-dev/tox) from 4.17.1 to 4.18.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.17.1...4.18.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-08-17 10:06:35 +00:00
yubiuser
9564a6e92d
[fix] [v6] typo in bash-completion allow-regex option (#5729) 2024-08-15 06:53:56 +02:00
Allen
27fd80c01e
[fix] [v6] typo in bash-completion allow-regex option
also removes a space from double whitespace

Signed-off-by: Allen Dema <64094914+allendema@users.noreply.github.com>

Signed-off-by: Allen <64094914+allendema@users.noreply.github.com>
2024-08-15 02:31:33 +02:00
yubiuser
e89d93a5d3
Merge development > development-v6 (#5725) 2024-08-10 15:26:41 +02:00