Merge pull request 'development' (#15 ) from development into master

Reviewed-on: #15
Merge branch 'master' into development
2026-03-18 14:11:08 +00:00 · 2026-03-18 14:10:58 +00:00 · 2026-03-14 14:49:24 +01:00 · 2026-03-14 14:46:50 +01:00 · 2026-03-14 10:02:46 +00:00 · 2026-03-14 10:02:24 +00:00
7 changed files with 9 additions and 9 deletions
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -29,12 +29,12 @@ jobs:
    # Initializes the CodeQL tools for scanning.
    -
      name: Initialize CodeQL
-      uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 #v4.32.3
+      uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 #v4.32.6
      with:
        languages: 'python'
    -
      name: Autobuild
-      uses: github/codeql-action/autobuild@9e907b5e64f6b83e7804b09294d44122997950d6 #v4.32.3
+      uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98 #v4.32.6
    -
      name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 #v4.32.3
+      uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 #v4.32.6
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
      issues: write

    steps:
-      - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d #v10.1.1
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f #v10.2.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 30
--- a/.github/workflows/stale_pr.yml
+++ b/.github/workflows/stale_pr.yml
@@ -17,7 +17,7 @@ jobs:
      pull-requests: write

    steps:
-      - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d #v10.1.1
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f #v10.2.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          # Do not automatically mark PR/issue as stale
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,7 +49,7 @@ jobs:
        run: editorconfig-checker

      - name: Check python code formatting with black
-        uses: psf/black@6305bf1ae645ab7541be4f5028a86239316178eb #26.1.0
+        uses: psf/black@c6755bb741b6481d6b3d3bb563c83fa060db96c9 #26.3.1
        with:
          src: "./test"
          options: "--check --diff --color"
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -169,7 +169,7 @@ initialize_debug() {
    # Display that the debug process is beginning
    log_write "${COL_PURPLE}*** [ INITIALIZING ]${COL_NC}"
    # Timestamp the start of the log
-    log_write "${INFO} $(date "+%Y-%m-%d:%H:%M:%S") debug log has been initialized."
+    log_write "${INFO} $(date "+%Y-%m-%d %H:%M:%S") debug log has been initialized."
    # Uptime of the system
    # credits to https://stackoverflow.com/questions/28353409/bash-format-uptime-to-show-days-hours-minutes
    system_uptime=$(uptime | awk -F'( |,|:)+' '{if ($7=="min") m=$6; else {if ($7~/^day/){if ($9=="min") {d=$6;m=$8} else {d=$6;h=$8;m=$9}} else {h=$6;m=$7}}} {print d+0,"days,",h+0,"hours,",m+0,"minutes"}')
--- a/advanced/Scripts/piholeNetworkFlush.sh
+++ b/advanced/Scripts/piholeNetworkFlush.sh
@@ -15,7 +15,7 @@ if [[ -f ${coltable} ]]; then
    source ${coltable}
 fi

-readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"
+PI_HOLE_SCRIPT_DIR="/opt/pihole"
 utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
 # shellcheck source=./advanced/Scripts/utils.sh
 source "${utilsfile}"
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -2,5 +2,5 @@ pyyaml == 6.0.3
 pytest == 9.0.2
 pytest-xdist == 3.8.0
 pytest-testinfra == 10.2.2
-tox == 4.35.0
+tox == 4.49.1
 pytest-clarity == 1.0.1
Author	SHA1	Message	Date
Айнур Карпиев	2a987db4be	Merge pull request 'development' (#15 ) from development into master Some checks failed CodeQL / Analyze (push) Has been cancelled Details Check for merge conflicts / main (push) Has been cancelled Details Sync Back to Development / Syncing branches (push) Has been cancelled Details Reviewed-on: #15	2026-03-18 14:11:08 +00:00
Айнур Карпиев	509c272ccb	Merge branch 'master' into development Some checks are pending CodeQL / Analyze (push) Waiting to run Details CodeQL / Analyze (pull_request) Waiting to run Details Check for merge conflicts / main (push) Waiting to run Details Test Supported Distributions / smoke-tests (pull_request) Waiting to run Details Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (centos_10) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (centos_9) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (debian_11) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (debian_12) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (debian_13) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_40) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_41) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_42) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_43) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Blocked by required conditions Details Check for merge conflicts / main (pull_request_target) Waiting to run Details	2026-03-18 14:10:58 +00:00
yubiuser	cf7139bad8	Bump psf/black from 26.3.0 to 26.3.1 in the github-actions-dependencies group (#6566 ) Some checks are pending CodeQL / Analyze (pull_request) Waiting to run Details Test Supported Distributions / smoke-tests (pull_request) Waiting to run Details Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (centos_10) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (centos_9) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (debian_11) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (debian_12) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (debian_13) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_40) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_41) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_42) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (fedora_43) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Blocked by required conditions Details Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Blocked by required conditions Details	2026-03-14 14:49:24 +01:00
yubiuser	c7eff386e5	Bump tox from 4.49.0 to 4.49.1 in /test in the python-dependencies group (#6567 )	2026-03-14 14:46:50 +01:00
dependabot[bot]	47de7d5913	Bump tox from 4.49.0 to 4.49.1 in /test in the python-dependencies group Bumps the python-dependencies group in /test with 1 update: [tox](https://github.com/tox-dev/tox). Updates `tox` from 4.49.0 to 4.49.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.49.0...4.49.1) --- updated-dependencies: - dependency-name: tox dependency-version: 4.49.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: python-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-14 10:02:46 +00:00
dependabot[bot]	ed3f72958b	Bump psf/black in the github-actions-dependencies group Bumps the github-actions-dependencies group with 1 update: [psf/black](https://github.com/psf/black). Updates `psf/black` from 26.3.0 to 26.3.1 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](`35ea67920b...c6755bb741`) --- updated-dependencies: - dependency-name: psf/black dependency-version: 26.3.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-14 10:02:24 +00:00
yubiuser	bdeb05b941	Bump tox from 4.46.3 to 4.49.0 in /test in the python-dependencies group (#6560 )	2026-03-07 17:06:39 +01:00
yubiuser	2d99a95dfb	Bump the github-actions-dependencies group with 2 updates (#6561 )	2026-03-07 17:05:35 +01:00
dependabot[bot]	8834b49fd3	Bump the github-actions-dependencies group with 2 updates Bumps the github-actions-dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [psf/black](https://github.com/psf/black). Updates `github/codeql-action` from 4.32.4 to 4.32.6 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](`89a39a4e59...0d579ffd05`) Updates `psf/black` from 26.1.0 to 26.3.0 - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](`6305bf1ae6...35ea67920b`) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.32.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-dependencies - dependency-name: psf/black dependency-version: 26.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-07 10:02:47 +00:00
dependabot[bot]	752273f400	Bump tox from 4.46.3 to 4.49.0 in /test in the python-dependencies group Bumps the python-dependencies group in /test with 1 update: [tox](https://github.com/tox-dev/tox). Updates `tox` from 4.46.3 to 4.49.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.46.3...4.49.0) --- updated-dependencies: - dependency-name: tox dependency-version: 4.49.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: python-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-07 10:02:46 +00:00
Dominik	3d3be66685	Remove `readonly` from piholeNetworkFlush.sh to avoid error message (#6554 )	2026-03-02 18:25:28 +01:00
RD WebDesign	36601eef3a	Remove `readonly` from piholeNetworkFlush.sh to avoid error message This is a quick fix to avoid the error when api.sh tries to set the variable again. Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2026-03-01 17:29:19 -03:00
yubiuser	ec0ce92aaa	Bump tox from 4.44.0 to 4.46.3 in /test in the python-dependencies group (#6552 )	2026-02-28 16:32:30 +01:00
dependabot[bot]	6dc67a48e9	Bump tox from 4.44.0 to 4.46.3 in /test in the python-dependencies group Bumps the python-dependencies group in /test with 1 update: [tox](https://github.com/tox-dev/tox). Updates `tox` from 4.44.0 to 4.46.3 - [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.44.0...4.46.3) --- updated-dependencies: - dependency-name: tox dependency-version: 4.46.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: python-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2026-02-28 10:02:45 +00:00
yubiuser	cda392ac97	Remove additional ':' from debug log system time output (#6551 )	2026-02-24 16:39:35 +01:00
yubiuser	08365b3795	Bump tox from 4.35.0 to 4.44.0 in /test in the python-dependencies group (#6546 )	2026-02-24 09:19:51 +01:00
Christian König	f28233729c	Remove additional ':' from debug log system time output Signed-off-by: Christian König <github@yubiuser.dev>	2026-02-24 08:51:07 +01:00
yubiuser	2acb7098d8	Bump the github-actions-dependencies group with 2 updates (#6547 )	2026-02-22 01:44:36 +01:00
dependabot[bot]	f2af7c8970	Bump the github-actions-dependencies group with 2 updates Bumps the github-actions-dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [actions/stale](https://github.com/actions/stale). Updates `github/codeql-action` from 4.32.3 to 4.32.4 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](`9e907b5e64...89a39a4e59`) Updates `actions/stale` from 10.1.1 to 10.2.0 - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](`997185467f...b5d41d4e1d`) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.32.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-dependencies - dependency-name: actions/stale dependency-version: 10.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2026-02-21 10:02:51 +00:00
dependabot[bot]	c8ff8b747f	Bump tox from 4.35.0 to 4.44.0 in /test in the python-dependencies group Bumps the python-dependencies group in /test with 1 update: [tox](https://github.com/tox-dev/tox). Updates `tox` from 4.35.0 to 4.44.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.35.0...4.44.0) --- updated-dependencies: - dependency-name: tox dependency-version: 4.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: python-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2026-02-21 10:02:39 +00:00