Use pihole-FTL prestart script from core repo to avoid code duplicati…

…on. Change the order of startup objects a little.

look at starting crond on startup

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

src/Dockerfile

@@ -44,7 +44,8 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then FTLARCH=amd64; \
     elif [ "$TARGETPLATFORM" = "linux/arm64/v8" ]; then FTLARCH=armv64; \
     elif [ "$TARGETPLATFORM" = "linux/riscv64" ]; then FTLARCH=riscv64; \
     else FTLARCH=amd64; fi \
-    && curl -sSL "https://ftl.pi-hole.net/development-v6/pihole-FTL-${FTLARCH}" -o /usr/bin/pihole-FTL
+    && curl -sSL "https://ftl.pi-hole.net/development-v6/pihole-FTL-${FTLARCH}" -o /usr/bin/pihole-FTL && \
+    chmod +x /usr/bin/pihole-FTL
 
 
 ADD https://ftl.pi-hole.net/macvendor.db /macvendor.db
@@ -56,7 +57,16 @@ RUN cd /etc/.pihole && \
     install -Dm755 -t /opt/pihole ./automated\ install/uninstall.sh && \
     install -Dm755 -t /opt/pihole ./advanced/Scripts/COL_TABLE && \
     install -Dm755 -t /usr/local/bin pihole && \
-    install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole
+    install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole && \
+    install -Dm644 ./advanced/Templates/pihole.cron /var/spool/cron/crontabs/pihole && \
+    # Randomize gravity update time
+    sed -i "s/59 1 /$((1 + RANDOM % 58)) $((3 + RANDOM % 2))/" /var/spool/cron/crontabs/pihole && \
+    # Randomize update checker time
+    sed -i "s/59 17/$((1 + RANDOM % 58)) $((12 + RANDOM % 8))/" /var/spool/cron/crontabs/pihole && \
+    # Grab some useful bits from FTL's service scripts
+    install -T -m 0755 ./advanced/Templates/pihole-FTL-prestart.sh /opt/pihole/pihole-FTL-prestart.sh && \
+    install -T -m 0755 ./advanced/Templates/pihole-FTL-poststop.sh /opt/pihole/pihole-FTL-poststop.sh
+
 
 
 ENV DNSMASQ_USER=pihole
@@ -68,7 +78,7 @@ ADD bash_functions.sh /usr/bin/bash_functions.sh
 ADD start.sh /usr/bin/start.sh
 
 RUN chmod +x /usr/bin/start.sh
-RUN chmod +x /usr/bin/pihole-FTL
+
 
 
 HEALTHCHECK CMD dig +short +norecurse +retry=0 @127.0.0.1 pi.hole || exit 1

src/start.sh

@@ -56,12 +56,6 @@ echo "  [i] pihole-FTL ($FTL_CMD) will be started as ${DNSMASQ_USER}"
 echo ""
 
 
-
-
-
-
-#!/usr/bin/env bash
-
 if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
     set -x ;
 fi
@@ -70,39 +64,15 @@ fi
 rm -f /dev/shm/FTL-* 2> /dev/null
 rm -f /run/pihole/FTL.sock
 
-# install /dev/null files to ensure they exist (create if non-existing, preserve if existing)
-mkdir -pm 0755 /run/pihole /var/log/pihole
-[[ ! -f /run/pihole-FTL.pid ]] && install /dev/null /run/pihole-FTL.pid
-[[ ! -f /var/log/pihole/FTL.log ]] && install /dev/null /var/log/pihole/FTL.log
-[[ ! -f /var/log/pihole/pihole.log ]] && install /dev/null /var/log/pihole/pihole.log
-[[ ! -f /etc/pihole/dhcp.leases ]] && install /dev/null /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 /var/log/pihole/FTL.log /var/log/pihole/pihole.log /etc/pihole/dhcp.leases /run/pihole /etc/pihole
-chmod 0644 /run/pihole-FTL.pid /var/log/pihole/FTL.log /var/log/pihole/pihole.log /etc/pihole/dhcp.leases # /etc/pihole/pihole.toml
-
-# Ensure that permissions are set so that pihole-FTL can edit the files. We ignore errors as the file may not (yet) exist
-chmod -f 0644 /etc/pihole/macvendor.db || true
-# Chown database files to the user FTL runs as. We ignore errors as the files may not (yet) exist
-chown -f pihole:pihole /etc/pihole/pihole-FTL.db /etc/pihole/gravity.db /etc/pihole/macvendor.db || true
-# Chown database file permissions so that the pihole group (web interface) can edit the file. We ignore errors as the files may not (yet) exist
-chmod -f 0664 /etc/pihole/pihole-FTL.db || true
-
-# Backward compatibility for user-scripts that still expect log files in /var/log instead of /var/log/pihole/
-# Should be removed with Pi-hole v6.0
-if [ ! -f /var/log/pihole.log ]; then
-    ln -s /var/log/pihole/pihole.log /var/log/pihole.log
-    chown -h pihole:pihole /var/log/pihole.log
+# Start FTL. TODO: We need to either mock the service file or update the pihole script in the main repo to restart FTL if no init system is present
+sh /opt/pihole/pihole-FTL-prestart.sh
+capsh --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null" &
 
-fi
-if [ ! -f /var/log/pihole-FTL.log ]; then
-    ln -s /var/log/pihole/FTL.log /var/log/pihole-FTL.log
-    chown -h pihole:pihole /var/log/pihole-FTL.log
-fi
+# Start crond for scheduled scripts (logrotate, pihole flush, gravity update etc)
+crond
 
 pihole -g
 
-capsh --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null" &
 tail -f /var/log/pihole-FTL.log
 
 # Notes on above: