ainur
b3a8a719d8
Merge branch 'master' into fix/version_null
Check for merge conflicts / main (push) Has been cancelled
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Check for merge conflicts / main (pull_request_target) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
2026-03-18 14:11:27 +00:00
ainur
509c272ccb
Merge branch 'master' into development
CodeQL / Analyze (push) Has been cancelled
CodeQL / Analyze (pull_request) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Check for merge conflicts / main (pull_request_target) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
2026-03-18 14:10:58 +00:00
ainur
d34d3f558a
Merge branch 'master' into tweak/update
Check for merge conflicts / main (push) Has been cancelled
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Check for merge conflicts / main (pull_request_target) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
2026-03-18 14:10:10 +00:00
ainur
ca06930a50
Merge branch 'master' into docker_disable_flush
Check for merge conflicts / main (push) Has been cancelled
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Check for merge conflicts / main (pull_request_target) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
2026-03-18 14:09:34 +00:00
ainur
ca9de23ca5
Merge branch 'master' into fix/version_file
Check for merge conflicts / main (push) Has been cancelled
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Check for merge conflicts / main (pull_request_target) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
2026-03-18 14:06:35 +00:00
ainur
ba86a1c23f
Merge branch 'master' into unsupported/binary
Check for merge conflicts / main (push) Has been cancelled
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Check for merge conflicts / main (pull_request_target) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
2026-03-18 14:03:11 +00:00
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
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
ec8df55f0d
Set versions in /etc/pihole/versions to null if script fails
...
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
Signed-off-by: Christian König <github@yubiuser.dev >
2026-02-23 11:33:06 +01:00
4125bcccdc
Files should be created before calling addOrEditKeyValPair
...
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
Signed-off-by: Christian König <github@yubiuser.dev >
2026-02-18 09:25:10 +01:00
ac37014628
Truncate version file instead of removing and creating freshly
...
Signed-off-by: Christian König <github@yubiuser.dev >
2026-02-18 09:22:11 +01:00
d765ce768f
Wipe version file before creating a new one
...
Signed-off-by: yubiuser <github@yubiuser.dev >
2026-02-16 20:11:17 +01:00
7442623f2f
Debug log - Add colors to gravity tables ( #6485 )
2025-12-04 12:52:07 -07:00
1f4ed9b518
Replace some strings with their colored equivalents
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2025-11-30 18:43:40 -03:00
95ae51bbdb
Use more specific strings on the tables to match only desired text
...
- use `--no---` and `--yes---` to make sure the strings won't match user
comments or parts of domains
- also use `-ALLOW-` and `-BLOCK-`
Also reduce the domain column to 90 characters
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2025-11-30 18:42:02 -03:00
247b0c506b
Remove custom FTL FirewallD zone checks from debug log
...
Removed checks for custom FTL FirewallD zone in piholeDebug.sh.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2025-11-26 23:46:43 -03:00
d4db2dca22
Improve gravity tables presentation on the debug log ( #6460 )
2025-11-25 18:59:04 +00:00
8c6bb3f8da
Use text colums instead of number codes on gravity tables
...
- Domains table ("type" column): replace 0, 1, 2 and 3 with
"exact-allow", "exact-deny", "regex-allow" and "regex-deny"
- All tables: use yes/no for "enabled" columns
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2025-11-20 16:46:38 -03:00
987a59f7e5
Show "Block" and "Allow" instead of 0 and 1
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2025-11-19 16:35:39 -03:00
1dc8bfc950
Use port from dns.port in piholeDebug.sh
...
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com >
2025-11-16 16:35:05 +01:00
bf41c3dded
debug - speed up processing and display of file contents and services
...
Use bash-internal globs and parameter expasion in preference to
assignment from output of ls or basename per file/directory.
When displaying file contents, call sed once and preprocesses the entire
file (eg pihole.toml), rather than spawning a new sed process for every
line of the file.
When checking services, call awk once to extract all data for each ip:port
pair, rather than three times.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2025-11-10 14:33:07 +10:00
40aa986af1
Add list "type" (block/allow) to the debug log table
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2025-11-03 17:39:36 -03:00
12342682b4
Separate log flush from log rotate
...
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
Signed-off-by: Christian König <github@yubiuser.dev >
2025-10-21 20:47:53 +02:00
106b999054
Rename views, upgrade gravity database and bump gravity databae version ( #6386 )
2025-10-05 20:33:30 +02:00
4bf67a3c79
Alpine: Add some additional dependencies and minor script fixes
...
Signed-off-by: Michael Ziminsky (Z) <mgziminsky@users.noreply.github.com >
2025-08-16 21:47:55 +00:00
9e258e7005
Rename views, upgrade gravity database and bump gravity databae version
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2025-08-15 19:39:21 +02:00
5cb601200c
Use non-interactive shell in utils.sh:getFTLConfigValue to avoid colored output
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2025-07-26 21:54:25 +02:00
24d8754033
Revert "pihole api - use keepalive for curl queries"
2025-07-26 12:35:02 +01:00
5b4a7b8b74
pihole api - use keepalive for curl queries
...
Adds the keepalive header to all curl requests
This reduces session establishment time across the multiple
requests necessary to authenticate, obtain response and log out
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2025-07-26 18:48:32 +10:00
29b6252935
Fix gravity user permission checking and fix error on pihole-FTL --config failures ( #6352 )
2025-07-22 15:27:07 -07:00
f324d4cc7d
Separate network flush and arp table flush functions ( #6319 )
...
This PR updates the function flushing the network tables and the ARP table. It separates the two, renaming the whole function to networkflush and makes flushing ARP optional by appending --arp. Deletion of the network table is now done via FTL's /action/flush/arp endpoint.
Documentation: https://github.com/pi-hole/docs/pull/1253
Related PR in the FTL repo: https://github.com/pi-hole/FTL/pull/2541
2025-07-22 15:20:50 -07:00
9580dc6560
Improve setFTLConfigValue function
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-07-22 12:50:42 +02:00
285b3c37f9
Tweak fluash ARP function
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-07-22 12:45:22 +02:00
be36432f24
Speed up pihole api ( #6336 )
2025-07-21 10:51:25 -07:00
a9e3d3b728
Use --skipFTL flag also for pihole repair and checkout
...
CodeQL / Analyze (pull_request) Has been cancelled
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
Signed-off-by: Christian König <github@yubiuser.dev >
2025-07-21 12:07:33 +02:00
a8db4def9a
Use flag --skipFTL instead of env var PIHOLE_SKIP_FTL_CHECK
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-07-21 11:54:12 +02:00
35ce3580e5
Reduce pihole --query jq calls ( #6334 )
2025-07-20 18:02:45 -07:00
90eb5778ca
Re-order authentication errors in verbose mode ( #6338 )
2025-07-20 17:46:07 -07:00
dad27f8d06
Remove readonly from list.sh to avoid errors
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2025-07-14 21:20:39 -03:00
71501e15e5
Re-order authentication errors in verbose mode
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-07-13 22:16:40 +02:00
0187087da0
Speed up pihole --api
...
Get session authentication information via single jq operation,
setting defaults if no data returned.
Simplify jq test for valid JSON data
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2025-07-14 05:44:46 +10:00
05ad3d7155
Update advanced/Scripts/query.sh
...
Co-authored-by: yubiuser <github@yubiuser.dev >
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2025-07-12 22:25:22 +00:00
ea8272d7d4
speed up pihole --query
...
Count list and gravity matches using jq in a single step.
Use jq's map to simplify list processing, eliminating intermediate
jsons.
Eliminate while loop for each lists's final output and formatting.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2025-07-12 14:25:17 +10:00
1e88ce4975
piholeDebug - Get default route robustly ( #6303 )
2025-07-11 16:19:54 -07:00
b3d193b34c
Update Firewalld tests to match v6 ports ( #6307 )
2025-07-10 14:15:41 -07:00
463086ef23
Skip FTL update check if $PIHOLE_SKIP_FTL_CHECK is set to true
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-07-10 21:57:38 +02:00
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
24f32d48af
Fix pihole -q by setting PI_HOLE_SCRIPT_DIR in api.sh ( #6284 )
2025-07-10 10:51:20 -07:00
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
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
ainur
RD WebDesign