Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-04-25 19:29:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,314 Commits 6 Branches 144 Tags
0e7013e890fae2a48ffc4e14b2d2d0aeab3f23a2
Commit Graph

35 Commits

Author SHA1 Message Date
Adam Warner
18e2e11541 Silence FTL output on container run (for now) (again!) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-04 18:07:08 +01:00
Dan Schaper
6b9abc23a0 Apply capabilities to pihole-FTL and notify DHCP wihtout NET_ADMIN. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-02 11:58:42 -07:00
Adam Warner
4dc9504330 evert pihole-FTL service command to use s6-setuidgid command when running pihole-FTL 
Update fix_capabilities to only apply net_admin and sys_nice if they are actually available to the container

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-02 10:50:55 +01:00
Adam Warner
af0af5a59a Supress FTL log output (for now) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-01 23:31:00 +01:00
Dan Schaper
54f56a717e Remove touch from runtime init scripts 
co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-01 11:45:16 -07:00
RD WebDesign
3cb043eb10 Use touch only if we need to create an absent file 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-03-31 15:00:47 -03:00
Dan Schaper
a485e238ca call capsh directly, no need to set uid/gid 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-03-28 18:37:03 -07:00
Dan Schaper
cf06b7ead3 Allow caps inheritance for raising to ambient. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-03-28 16:48:46 -07:00
Dan Schaper
086dd6cc86 Bullseye based capsh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-03-28 14:37:13 -07:00
edgd1er
2db09515d7 add suggested changes to send logs to stdout 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2022-01-28 08:12:40 +01:00
edgd1er
06d6b74c63 add finish scripts for logs. prevent duplicate cat processes, lighttpd start loop 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2022-01-27 05:49:59 +01:00
edgd1er
140312b79c Redirect lighttpd logs to stdout 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2022-01-27 04:17:42 +01:00
Adam Warner
1f3951431b tweak per https://github.com/pi-hole/docker-pi-hole/pull/991#pullrequestreview-864021964 2022-01-26 21:06:17 +00:00
Adam Warner
2eb9afc350 Touch/chown lighttpd access/error logs on service start. May not be 100% neccasery currently, but could be useful 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-26 18:29:14 +00:00
Adam Warner
25539a9c99 Merge pull request #982 from edgd1er/dev_origin 
[Experimental] Add ability to change UID / GID for www-data and pihole user.
 2022-01-20 17:16:04 +00:00
Adam Warner
fe1676b9ed Move a few things about. Set permissions pihole-FT requires in it's run script. remove pihole-FTL test from test-config because nothing exists until it has started for the first time. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-17 23:28:02 +00:00
Peter Dave Hello
b29ac1ec18 Use consistent method to kill process in s6 finish script 
If the process does not exist, the error message of `kill` command is a
little bit confusing:

`kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]`

Using `killall` in `/s6/debian-root/etc/services.d/pihole-FTL/finish` to
kill the process, like what we do in `cron/finish` & `lighttpd/finish`,
will make the usage in this project more consistent, and also, the
command `killall` will provide better & friendly output, like:

`pihole-FTL: no process found`

Close #986, cc #973

Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
 2022-01-17 22:19:23 +08:00
Adam Warner
9deb685cc0 When restarting the service - wait until the old proc has been killed before attempting to start it again. Prevents messages about the usuage of kill in the log. 
Remove old comment

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-07 23:14:28 +00:00
Adam Warner
a5eda6844e use kill -15 (TERM) instead of 9 to exit FTL a bit more gracefully and save queries to the database 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:30:31 +00:00
Adam Warner
0eb1a60d78 Switch default DNSMASQ_USER to pihole from root, and fix permissions on pihole-FTL.db to belong to pihole:pihole 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:29:54 +00:00
Adam Warner
abdf9f1130 remove shared memory files before starting the FTL process. Mimics bare metal service script (to an extent) (#796) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-02-16 23:09:49 +00:00
Adam Hill
fca7769b33 remove ServerIP requirement, simpler example commands 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-07 19:51:15 -06:00
Mathieu Hofman
6629aff889 Allow running pihole-FTL as non-root 
- Add a new container environment variable allowing to specify the user to run the pihole-FTL process as. Defaults to root.
- Set inherited capabilities attributes on the pihole-FTL file to automatically grant runtime permitted capabilities when available in the bounding set. This allows dropping root before starting pihole-FTL without failing with a permission error if the capabilities are not available to the container (the process may still error out if performing an operation requiring the capability).
- Add some information on capabilities to the Readme file.

Signed-off-by: Mathieu Hofman <86499+mhofman@users.noreply.github.com>
 2019-02-06 02:31:33 -08:00
Adam Hill
2336174036 comment tweak 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-01 14:21:53 -06:00
Adam Hill
d9ca4187b9 new pihole dev 2019-01-01 13:51:33 -06:00
Adam Hill
187c1d3f29 stop using pihole init.d stop, may be going away 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 10:30:51 -05:00
Adam Hill
e7ae12a94c Add fixes for config permissions, deprection notice 2018-08-02 22:50:01 -05:00
Adam Hill
0e7ab463fa add finish scripts to restart cleanly 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-19 22:57:05 -05:00
diginc
ad6b4be403 Fixes to the startup, services, and dnsmasq references 2018-07-03 00:19:01 -05:00
diginc
d45bccf9b4 remove dnsmasq service for new pihole-FTL service 2018-07-02 20:50:31 -05:00
Adam Hill
d57159e9ea Update run 2018-03-07 10:55:49 -06:00
diginc
1c598d3078 adding FTL_CMD for debug 2018-03-01 22:16:38 -06:00
diginc
b9095bc123 This commit is too big, but it works 
* Tests are passing, hopefully consistently
* FTL pulling from official releases
  * thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
 2017-05-13 17:03:24 -05:00
diginc
8d0ea48ecd 3.0.1 progress 2017-05-09 15:03:03 -05:00
diginc
9f61b87198 debian converted to s6, aline files moved 2017-05-05 21:48:03 -05:00