ca06930a50
Merge branch 'master' into docker_disable_flush
Check for merge conflicts / main (push) Waiting to run
CodeQL / Analyze (pull_request) Waiting to run
Test Supported Distributions / smoke-tests (pull_request) Waiting to run
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (centos_10) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (centos_9) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_11) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_12) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_13) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_40) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_41) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_42) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_43) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Blocked by required conditions
Check for merge conflicts / main (pull_request_target) Waiting to run
2026-03-18 14:09:34 +00:00
0a903feb12
Merge branch 'master' into more_time
Check for merge conflicts / main (push) Waiting to run
CodeQL / Analyze (pull_request) Waiting to run
Test Supported Distributions / smoke-tests (pull_request) Waiting to run
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (centos_10) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (centos_9) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_11) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_12) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_13) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_40) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_41) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_42) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_43) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Blocked by required conditions
Check for merge conflicts / main (pull_request_target) Waiting to run
2026-03-18 14:08:30 +00:00
yubiuser
3d25d20e86
systemd service - don't use deprecated PermissionsStartOnly ( #6465 )
2025-11-09 10:44:21 +01:00
Rob Gill
7452c95080
systemd service - don't use deprecated PermissionsStartOnly
...
- elevate Prestart and Poststop script permissions using "+" prefix instead,
as per https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#Command%20lines
( PermissionsStartOnly was deprecated in systemd 241 and no longer appears in
documentation since 2018 https://github.com/systemd/systemd/pull/10802 )
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2025-11-08 15:35:10 +10:00
Sparronator9999
4ff250edac
Fix libcap capabilities not being granted on OpenRC distros
...
Created on behalf of @mgziminsky - see this issue comment: https://github.com/pi-hole/pi-hole/issues/6454#issuecomment-3476576177
Signed-off-by: Sparronator9999 <86388887+Sparronator9999@users.noreply.github.com >
2025-11-02 07:29:20 +11:00
Adam Warner
1d6b3cd894
Add log file path variables and ensure log files are created if missing ( #6441 )
2025-10-28 13:40:00 +00:00
Yannick7777
72e3699265
Add log file path variables and ensure log files are created if missing
...
Signed-off-by: Yannick7777 <admin@eyer.life >
2025-10-26 15:19:56 +01:00
casperklein
1818e7e59e
Ensure 'versions' file exist on first start
...
Signed-off-by: casperklein <casperklein@users.noreply.github.com >
2025-10-26 12:05:13 +01:00
Christian König
12342682b4
Separate log flush from log rotate
...
CodeQL / Analyze (pull_request) Waiting to run
Test Supported Distributions / smoke-tests (pull_request) Waiting to run
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (centos_10) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (centos_9) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_11) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_12) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_13) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_40) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_41) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_42) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Blocked by required conditions
Signed-off-by: Christian König <github@yubiuser.dev >
2025-10-21 20:47:53 +02:00
Dominik
106b999054
Rename views, upgrade gravity database and bump gravity databae version ( #6386 )
2025-10-05 20:33:30 +02:00
Michael Ziminsky (Z)
0db48383ae
Add support for alpine
...
Signed-off-by: Michael Ziminsky (Z) <mgziminsky@users.noreply.github.com >
2025-08-16 21:47:54 +00:00
DL6ER
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
Christian König
1a3a23a867
Give FTL 120 seconds to shutdown
...
CodeQL / Analyze (pull_request) Waiting to run
Test Supported Distributions / smoke-tests (pull_request) Waiting to run
Test Supported Distributions / distro-test (centos_10) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (centos_9) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_11) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (debian_12) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_40) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_41) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (fedora_42) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Blocked by required conditions
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Blocked by required conditions
Signed-off-by: Christian König <github@yubiuser.dev >
2025-05-26 21:38:26 +02:00
Christian König
842afc2475
Give FTL 60 seconds for graceful shutdown
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-05-12 19:02:29 +02:00
Dominik
95c1b1a542
Add ON DELETE CASCADE to FOREIGN KEY REFERENCES in gravity.db ( #6113 )
2025-04-15 06:24:52 +02:00
Christian König
5002ce8ba7
Source files relative to the repos root
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-04-07 14:10:01 +02:00
Christian König
ca1bab3c1b
Fix more shellcheck warnings
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-04-07 10:52:57 +02:00
yubiuser
36e6c9921e
Shellcheck Tweaks ( #6147 )
2025-04-07 10:08:25 +02:00
Christian König
9f5e18b1cd
Make it 644
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-04-06 21:13:47 +02:00
Christian König
e579397f51
Allow all users to read the version file
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-04-06 20:52:57 +02:00
Adam Warner
2088601148
Add .shellcheckrc to configure shellcheck ignore SC1090-1 globally
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2025-04-06 18:46:47 +01:00
Adam Warner
4108c817dc
Revert "source with source not dot ( #6137 )"
...
This reverts commit 8fd2ebd3d7 , reversing
changes made to 557bc6f179 .
2025-04-04 19:12:57 +01:00
Michael Woolweaver
4efe4dfd4b
source with source not dot
...
Signed-off-by: Michael Woolweaver <michael@woolweaver.bid >
2025-04-02 14:21:45 -05:00
DL6ER
71ec0a0244
Add ON DELETE CASCADE to FOREIGN KEY REFERENCES in gravity.db
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2025-03-27 13:10:53 +01:00
yubiuser
349544b24a
Create webserver.log on FTL startup ( #6051 )
2025-03-10 06:14:22 +01:00
casperklein
9b4502a7a9
Add trailing / to directories
...
Signed-off-by: casperklein <casperklein@users.noreply.github.com >
2025-03-07 23:00:40 +01:00
Christian König
e437e3a805
Create webserver.log on FTL startup
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-03-06 09:48:06 +01:00
Jack'lul
0130f7be74
Fix find command syntax, remove log dir from search
...
Signed-off-by: Jack'lul <8418678+jacklul@users.noreply.github.com >
2025-03-01 14:43:36 +01:00
MichaIng
ad6a48b219
Add comment about TLS-related file permissions
...
Co-authored-by: Dominik <DL6ER@users.noreply.github.com >
Signed-off-by: MichaIng <micha@dietpi.com >
2025-02-26 20:59:32 +01:00
MichaIng
83a38bb71d
Add comment about file permissions
...
Co-authored-by: Dominik <DL6ER@users.noreply.github.com >
Signed-off-by: MichaIng <micha@dietpi.com >
2025-02-26 12:26:50 +01:00
MichaIng
232d581916
Re-add comment about execute bit on directory
...
Co-authored-by: Dominik <DL6ER@users.noreply.github.com >
Signed-off-by: MichaIng <micha@dietpi.com >
2025-02-26 12:25:51 +01:00
MichaIng
0b380d671d
Follow symlinks with find
...
Incorporating https://github.com/pi-hole/pi-hole/pull/5997
Signed-off-by: MichaIng <micha@dietpi.com >
2025-02-24 17:37:01 +01:00
MichaIng
e70981d80f
Do not overwrite TLS cert/key mode
...
FTL correctly creates the cert and especially private key with 0600 mode. But the prestart scripts changes it to 0660.
After removing the dedicated webserver from Pi-hole setups, the pihole group has no purpose anymore, and files should not be writable to any other user than pihole itself, and the private TLS key not reasable to anyone else either.
Additionally, this commit consolidates the chmod calls, applying 0755 to all directories and 0640 to all files, but the TLS key and cert.
Signed-off-by: MichaIng <micha@dietpi.com >
2025-02-24 17:29:58 +01:00
Christian König
b59ab5852a
Add missing trailing / when setting permissions of /etc/pihole
...
Signed-off-by: Christian König <github@yubiuser.dev >
2025-02-24 15:59:11 +01:00
DL6ER
579dc07046
Merge branch 'development' into tweak/gravity_backup
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-11-26 21:08:09 +01:00
DL6ER
633c971a44
Store failed gravity restoration status in message table
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-11-23 09:44:39 +01:00
DL6ER
2dc5bd15cc
Remove remaining traces of audit log
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-11-16 09:45:53 +01:00
Christian König
2fd51bd244
Fix gavity version 19
...
Signed-off-by: Christian König <github@yubiuser.dev >
2024-10-18 23:00:31 +02:00
Christian König
1ed5994fa5
Remove temporal log file symlink code. It was introduced 2 years ago with v5.11 and always thought to be temporarily only
...
Signed-off-by: Christian König <github@yubiuser.dev >
2024-07-29 09:25:12 +02:00
Christian König
db1431a1ae
Remove obsolet files
...
Signed-off-by: Christian König <github@yubiuser.dev >
2024-07-29 09:25:12 +02:00
Christian König
2c32d485bd
Remove obsolet getFTLPIDFile()
...
We can get the path of the PID file via getFTLConfigValue files.pid
Signed-off-by: Christian König <github@yubiuser.dev >
2024-07-27 22:00:52 +02:00
Christian König
fafd47ba75
Please editorconfig-checker
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2024-07-02 20:57:28 +02:00
DL6ER
e232361b2d
Add CAP_SYS_TIME to FTL's ambient capabilities
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-06-07 19:02:43 +02:00
DL6ER
b5ab8ac198
Change UNIQUEness constraint from (address) to (address, type) in the adlist table. This will allow certain adlists to be associated to different groups. A possible scenario is an adlist meant to block a specific service (e.g. Twitter, Youtube, etc.). It can then either be used to ensure these services are really blocked on the devices of group A but will never be blocked on devices of group B.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2024-02-11 16:54:22 +01:00
DL6ER
0066c6fbff
Make IDs of anti-/gravity lists available in vw_(anti)gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-12-25 05:29:29 +01:00
Christian König
a87d1bbc4f
Remove pihole.sudo
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-12-09 21:04:56 +01:00
Christian König
d77dbf736c
Logrotate config file needs to be owned by root
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-10-18 22:09:38 +02:00
Christian König
40c75289b5
Allow pihole to access subdirs in /etc/pihole
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-10-13 20:07:25 +02:00
Adam Warner
69a264a3c2
Add antigravity support to gravity ( #5330 )
2023-09-29 19:09:24 +01:00
Christian König
3c693c1da5
Apply suggestions from code review
...
Co-authored-by: DL6ER <dl6er@dl6er.de >
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-08-06 12:04:55 +02:00