arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity
6,404 Commits 9 Branches 109 Tags 20 MiB
cc476a49fe
Commit Graph

6404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
cc476a49fe
remove the restartdns functionality and promote the reloaddns functions 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-24 14:15:15 +01:00
yubiuser
564957c203
Remove lines containing Adguard JavaScript rules from adlists (#5754) 2024-09-23 23:33:14 +02:00
yubiuser
8dbdae40e8
Add fallback option for OS check without hard-coded nameserver (#5751) 2024-09-23 22:59:56 +02:00
yubiuser
e3dc06708c
Bump tox from 4.18.1 to 4.20.0 in /test (#5777) 2024-09-21 12:22:24 +02:00
dependabot[bot]
885895e994
Bump tox from 4.18.1 to 4.20.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.18.1 to 4.20.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.18.1...4.20.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-09-21 10:10:37 +00:00
yubiuser
0cf0b2ab76
Bump pytest from 8.3.2 to 8.3.3 in /test (#5769) 2024-09-14 12:47:09 +02:00
dependabot[bot]
05707c624d
Bump pytest from 8.3.2 to 8.3.3 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.2 to 8.3.3.
- [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.3.2...8.3.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-14 10:36:07 +00:00
yubiuser
65d6f5d890
Bump tox from 4.18.0 to 4.18.1 in /test (#5770) 2024-09-14 12:35:25 +02:00
dependabot[bot]
20d20e116c
Bump tox from 4.18.0 to 4.18.1 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.18.0 to 4.18.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.18.0...4.18.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-14 10:25:32 +00:00
yubiuser
b1acea33a1
Revert "Return early during v6 migration if migration dir exists" (#5768) 2024-09-14 07:04:47 +02:00
Christian König
6888897999
Revert "Return early during v6 migration if migration dir exists" 
This reverts commit 251f3295f3.
 2024-09-13 21:15:25 +02:00
yubiuser
3daaabfebd
Return early during v6 migration if migration dir exists (#5766) 2024-09-12 21:44:46 +02:00
Christian König
251f3295f3
Return early during v6 migration if migration dir exists 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-12 21:32:36 +02:00
Adam Warner
23f6c3069a
Sync master back into development (#5764) 2024-09-11 23:11:03 +01:00
Adam Warner
7128c18b4c
Make install command copyable (#5763) 2024-09-11 23:10:30 +01:00
Jim Bennett
3e8189e9ce
Make install command copyable 
The instal command was in a header with inline markdown. This means there's no copy button on GitHub. Moving to a markdown block gives the copy button.

Signed-off-by: Jim Bennett <jimbobbennett@mac.com>
 2024-09-11 15:00:57 -07:00
yubiuser
62ef2d1777
Add forgetting dash 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2024-09-11 18:44:17 +02:00
Christian König
ce5ef79a3a
Reduce code duplications and add check via IPv6 without hard-coded nameserver 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-11 13:43:57 +02:00
yubiuser
092891aeb4
Add /etc/pihole/dnsmasq.conf to debug log (stripped-down version) (#5740) 2024-09-09 21:41:30 +02:00
DL6ER
d60ad57cac
Add /etc/pihole/dnsmasq.conf to debug log (stripped-down version) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-09-09 21:37:34 +02:00
Dominik
53220cb5d6
Fix wrong message being displayed while waiting for the DNS (#5757) 2024-09-09 19:34:02 +02:00
Jack'lul
129272a695
Fix wrong message being displayed while waiting for DNS 
Signed-off-by: Jack'lul <jacklulcat@gmail.com>
 2024-09-09 19:08:47 +02:00
Christian König
f02162b021
Update comment 
Signed-off-by: Christian König <github@yubiuser.dev>
 2024-09-06 21:22:22 +02:00
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