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

149 Commits

Author SHA1 Message Date
Michael Woolweaver
4efe4dfd4b source with source not dot 
Signed-off-by: Michael Woolweaver <michael@woolweaver.bid>
 2025-04-02 14:21:45 -05: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
Christian König
7bb0ca59d1 Remove traces of /run/pihole 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-05 14:54:09 +02:00
Christian König
587a2a1c04 # allow all users to enter der directories 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-04 23:52:53 +02:00
Christian König
c360743d41 Re-add file/folder permissions 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-04 21:12:40 +02:00
Christian König
a3ea2cd8c3 User pihole should be allowed to edit all its files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-04 19:32:19 +02:00
Christian König
5ae0405446 Ensure pihole-FTL can write custom.list 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-03 20:46:01 +02:00
DL6ER
375d4d9bc1 Add type as new field of view vw_adlist 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-07-18 08:13:36 +01:00
DL6ER
00cbb8bc8a Add antigravity support to gravity 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-07-18 08:13:36 +01:00
DL6ER
64319fa96e Add /var/log/pihole/webserver.log to the logrotate scripts. While it may be empty for most, it can grow quickly if either API or TLS debugging is enabled (it can quickly reach several hundreds of MB per day when debugging TLS) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-07-05 22:11:56 +01:00
Adam Warner
c557f29db2 Set new gravity database version to 16, which was missed in 5459daa 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 23:01:27 +01:00
DL6ER
5459daa03d Add abp_entries column (default 0) to the adlist table for newly created gravity databases. This updates the gravity database version to 16 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-15 09:36:17 +02:00
DL6ER
c92826c152 Do not copy info table during pihole -g 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-05-24 21:32:34 +02:00
Christian König
9e47b61c8f Apply suggestions from code review 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-01-03 21:20:22 +01:00
Christian König
f713b14ba0 Cleanup if startup failed 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-12-08 09:49:02 +01:00
Adam Warner
ff5ee29566 Add native systemd service (#4924) 2022-11-27 21:41:35 +00:00
MichaIng
81927334f2 Add native systemd service 
Inspired by: https://github.com/pi-hole/pi-hole/pull/2112

A pre-start and a post-stop script are added to reduce doubled setup and cleanup code.

Since systemd services do not natively support dynamic users, test once whether capabilities are supported during install/update, and remove User=pihole otherwise.

Signed-off-by: MichaIng <micha@dietpi.com>
Co-authored-by: DL6ER <dl6er@dl6er.de>
 2022-10-30 19:40:33 +01:00
Christian König
18d28533eb Update local and remote versions at the same time 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 12:36:17 +02:00
Christian König
3d01e4d0cf No detour - use pihole-FTL.conf to get the API port number 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-09-26 22:55:30 +02:00
Peter Russell
951b4ed002 Remove cronjob that checks local versions every 10 minutes - only check when required (#4939) 
* eliminate updatechecker local from pihole cron job

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* resolving stickler-ci items

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* undo changes to updatecheck.sh (request from PromoFaux)

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* applied recommendation from PromoFaux

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* Indent the code inside the function

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* removed unnecessary updatecheck for core

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>

* eliminate updatechecker local from pihole cron job

Co-authored-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2022-09-24 16:14:44 +01:00
Dan Schaper
989c52ef24 Exit with return code if ftl does not start 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-08-04 17:20:39 -07:00
Christian König
3327df8d9c Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created on startup 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-08-04 14:47:43 +02:00
Christian König
7b77d991df Move FTL port and PID functions to utils.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-07-26 14:38:03 +02:00
DL6ER
98c238064e Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-07-03 18:43:45 +02:00
Christian König
954a0c2a14 Remove read permission for others on senible log files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-06-19 23:09:05 +02:00