ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
6,860 Commits 10 Branches 126 Tags
1bef0415dbb76c0db6e4ec1dd324392cac230077
Commit Graph

6860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner 1bef0415db bare minimum first past fix for pihoe api command not working due to attempting to re-set readony variabes PI_HOE_SCRIPT_DIR and utisfie. 
Can't compain about them being readony if they're.. not.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-07-14 22:02:02 +01:00
Dan Schaper 605ff8183a Sync master back into development (#6341) 2025-07-14 11:45:03 -07:00
Dan Schaper 9494dc6061 Pi-hole Core v6.1.3 (#6337) v6.1.3 2025-07-14 07:14:43 -07:00
Dan Schaper 9605ccc178 basic-install.sh listing interfaces (#6269) 2025-07-13 11:57:32 -07:00
deHakkelaar 86bdae0076 Update basic-install.sh 
Added comments
 2025-07-13 11:05:58 +02:00
Dan Schaper 1e88ce4975 piholeDebug - Get default route robustly (#6303) 2025-07-11 16:19:54 -07:00
Adam Warner bb60e2e346 Sync master back into development (#6332) 2025-07-11 21:02:14 +01:00
Adam Warner 3977a312f0 Update release.yml 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-07-11 21:01:01 +01:00
Dan Schaper b3d193b34c Update Firewalld tests to match v6 ports (#6307) 2025-07-10 14:15:41 -07:00
Dan Schaper 0a36e9d949 update: abort if FTL branch does not exist (#6329) 2025-07-10 12:55:12 -07:00
MichaIng 6db6c68a4e update: abort if FTL branch does not exist 
Currently, if the FTL update check returns 404, hence the FTL branch does not seem to exist, an error message is printed, but the update continues, only the FTL update is skipped.

This can lead to setups with v5 FTL and v6 core/web, failing at config migration, where FTL is invoked with a v6-only command.

With this change, the update aborts immediately if the FTL branch is invalid, like it does in case of other FTL update check errors (other HTTP error codes than 404 or other curl errors). Hence it continues only if FTL is up-to-date already, or a new version from the given branch has been found.

Signed-off-by: MichaIng <micha@dietpi.com>
 2025-07-10 21:37:28 +02:00
Dan Schaper 5b5e02d492 Do not skip root check for pihole user (#6312) 2025-07-10 11:48:29 -07:00
Dan Schaper a2dd0e2f50 Prevent gravity curl from using unset bash variable's empty string. (#6191) 2025-07-10 11:29:00 -07:00
Dan Schaper 3d75ea6df2 Only update the package cache on fresh installations (#6282) 2025-07-10 11:20:03 -07:00
Dan Schaper 080e1ccf8a installer: exit if FTL update check fails (#6316) 2025-07-10 10:59:05 -07:00
Dan Schaper 24f32d48af Fix pihole -q by setting PI_HOLE_SCRIPT_DIR in api.sh (#6284) 2025-07-10 10:51:20 -07:00
Dan Schaper 8486cfd95a Update python version used in test to 3.13 (#6321) 2025-07-10 10:47:49 -07:00
yubiuser c81d5019a3 Bump pytest-xdist from 3.7.0 to 3.8.0 in /test (#6324) 2025-07-05 23:07:49 +02:00
dependabot[bot] c5c5116e53 Bump pytest-xdist from 3.7.0 to 3.8.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.7.0 to 3.8.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.7.0...v3.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-07-05 10:28:30 +00:00
Christian König 2f9fa80d7a Update python version used in test to 3.13 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-07-01 13:34:55 +02:00
Dominik f2280eb330 taillog Prevent grep interpeting search term as an option (#6318) 2025-06-29 07:08:21 +02:00
Rob Gill f24fc9573a taillog Prevent grep interpeting search term as an option 
Adds '--' indicating end of options before the user provided
search pattern.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2025-06-29 06:45:02 +10:00
MichaIng 3a35e589f2 installer: exit if FTL update check fails 
The return code of `FTLdetect()` is used in the installer to know whether FTL has been installed or not.

The function however returns an error only, if the download of FTL fails, not if checking for a latest version/update of FTL fails. This way, installs and rapairs can continue without or with ourdated FTL until `pihole-FTL migrate v6`, which hangs endlessly, if it is a v5 FTL.

This commit handles the return code in `FTLdetect()`, and lets it return true only if FTL download succeeded, or if the update check succeeded and FTL is up-to-date. Else, it could neither be repaired, nor installed, and the error message should give a hint what went wrong, hence exit.

`FTLdetect()` is not called by any other script, hence this change has no surprising effect elsewhere.

Additionally, a syntax error in the `FTLcheckUpdate()` function itself is fixed, which masks the `check_download_exists()` return code, hence always leads to error code 4, if the FTL branch is not `master`.

Signed-off-by: MichaIng <micha@dietpi.com>
 2025-06-26 00:53:49 +02:00
Rob Gill 19d5943440 piholeDebug - Get default route robustly 
Determine address and interface of default route by preceeding
    'via' and 'dev' fields in json output instead of plain text
    field position.

    Log if unable to determine default gateway

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2025-06-25 05:10:12 +10:00
Dominik f90677a1ff Clean COL_TABLE and allow to send color codes when invoked by FTL (${FORCE_COLOR}) (#6314) 2025-06-24 19:24:40 +02:00
Christian König daec6f8c02 Set color codes when FORCE_COLOR is true 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-24 19:03:24 +02:00
Christian König a48665c7bb Remove deprecated and unused colors 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-24 18:51:01 +02:00
Adam Warner 8a97a1433a Fix dependabot (#6297) 2025-06-22 14:28:08 +02:00
Adam Warner f94d9f2540 Add note about adding local user to pihole group to final dialog (#6152) 2025-06-22 14:13:46 +02:00
Christian König 830c4bc049 Do not skipp root check for pihole user 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-21 22:40:43 +02:00
yubiuser 1dbe425146 Bump pytest from 8.4.0 to 8.4.1 in /test (#6311) 2025-06-21 14:31:07 +02:00
yubiuser fc2f7795e9 Bump tox from 4.26.0 to 4.27.0 in /test (#6310) 2025-06-21 14:30:38 +02:00
dependabot[bot] 0bc06ed204 Bump pytest from 8.4.0 to 8.4.1 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.4.0 to 8.4.1.
- [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.4.0...8.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-21 10:10:47 +00:00
dependabot[bot] 700c892dff Bump tox from 4.26.0 to 4.27.0 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.26.0 to 4.27.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.26.0...4.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-21 10:10:43 +00:00
RD WebDesign 405053692a Add HTTPS and NTP services to firewalld test 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2025-06-17 21:32:49 -03:00
RD WebDesign 04d9d32444 Remove test for port 4711 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2025-06-17 20:19:13 -03:00
Christian König c19e907c0c Fix dependabot 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-09 19:06:15 +02:00
Christian König 7a16024020 Run package update everytime before building the meta package when invoking from the install script 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-08 21:31:56 +02:00
Christian König 5777497f52 Separate package manager detection and cache update functions 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-08 21:25:43 +02:00
Adam Warner 404dc7cb88 Add 'never-stale' to the exempt issue labels of the stale workflow (#6283) 2025-06-08 15:06:33 +01:00
Adam Warner 2f3dfef862 Dependabot: group updates (#6294) 2025-06-07 18:36:35 +01:00
XhmikosR b39c9956e8 Dependabot: group updates 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2025-06-07 18:27:46 +03:00
yubiuser 70bcb0bb2b Bump pytest-xdist from 3.6.1 to 3.7.0 in /test (#6254) 2025-06-07 12:32:36 +02:00
dependabot[bot] 2c1032090d Bump pytest-xdist from 3.6.1 to 3.7.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.6.1 to 3.7.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.6.1...v3.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-07 10:07:56 +00:00
yubiuser b5adc981c2 Bump pytest from 8.3.5 to 8.4.0 in /test (#6293) 2025-06-07 12:06:51 +02:00
dependabot[bot] 3933cb0575 Bump pytest from 8.3.5 to 8.4.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.5 to 8.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/8.3.5...8.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-07 10:01:39 +00:00
Dan Schaper 6964cd124e Sync master back into development (#6291) 2025-06-06 16:22:37 -07:00
Christian König d16c049768 Set PI_HOLE_SCRIPT_DIR in api.sh 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-05 14:45:29 +02:00
Christian König 5ff4f000d5 Add 'never-stale' to the exempt issue labels of the stale workflow 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-05 14:16:27 +02:00
Christian König 93ecfb9504 We test a fresh installaton, so don't pretend this is not a fresh installation 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-06-05 13:09:03 +02:00