docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'touch_only_if_needed' into fix/touch_guard

This commit is contained in:
Dan Schaper 2022-03-31 12:46:34 -07:00
parent 72b1c8679c 3cb043eb10
commit ecb0a8c87b
No known key found for this signature in database
GPG Key ID: 6055EE2AD4004FC0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
s6/debian-root/etc/services.d/lighttpd/run
View File

@ -19,8 +19,10 @@ else
#remove fifo if exists
[[ -p /var/log/lighttpd/access.log ]] && rm -Rf /var/log/lighttpd/access.log
[[ -p /var/log/lighttpd/error.log ]] && rm -Rf /var/log/lighttpd/error.log
# Touch log files to ensure they exist (create if non-existing, preserve if existing)
touch /var/log/lighttpd/access.log /var/log/lighttpd/error.log
[[ ! -f /var/log/lighttpd/access.log ]] && touch /var/log/lighttpd/access.log
[[ ! -f /var/log/lighttpd/error.log ]] && touch /var/log/lighttpd/error.log
# Ensure that permissions are set so that lighttpd can write to the logs
chown -R www-data:www-data /var/log/lighttpd

6
s6/debian-root/etc/services.d/pihole-FTL/run
View File

@ -7,7 +7,11 @@ rm /run/pihole/FTL.sock 2> /dev/null
# Touch files to ensure they exist (create if non-existing, preserve if existing)
mkdir -pm 0755 /run/pihole
touch /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole-FTL.log /var/log/pihole.log /etc/pihole/dhcp.leases
[[ ! -f /run/pihole-FTL.pid ]] && touch /run/pihole-FTL.pid
[[ ! -f /run/pihole-FTL.port ]] && touch /run/pihole-FTL.port
[[ ! -f /var/log/pihole-FTL.log ]] && touch /var/log/pihole-FTL.log
[[ ! -f /var/log/pihole.log ]] && touch /var/log/pihole.log
[[ ! -f /etc/pihole/dhcp.leases ]] && touch /etc/pihole/dhcp.leases
# Ensure that permissions are set so that pihole-FTL can edit all necessary files
chown pihole:pihole /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole-FTL.log /var/log/pihole.log /etc/pihole/dhcp.leases /run/pihole /etc/pihole