Merge branch 'fix/logrotate' and resolve merge conflicts

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

Author: PromoFaux

src/Dockerfile

@@ -75,14 +75,14 @@ RUN cd /etc/.pihole && \
     install -Dm755 -t /opt/pihole ./advanced/Scripts/*.sh && \
     install -Dm755 -t /opt/pihole ./advanced/Scripts/COL_TABLE && \
     install -Dm755 -d /etc/pihole && \
-    install -Dm644 -t /etc/pihole ./advanced/Templates/logrotate && \
     install -Dm755 -d /var/log/pihole && \
     install -Dm755 -d /var/lib/logrotate && \
     install -Dm755 -t /usr/local/bin pihole && \
     install -Dm644 ./advanced/bash-completion/pihole.bash /etc/bash_completion.d/pihole && \
     install -Dm644 ./advanced/bash-completion/pihole-ftl.bash /etc/bash_completion.d/pihole-FTL && \
     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 && \
+    install -T -m 644 ./advanced/Templates/logrotate /etc/logrotate.d/pihole && \
     addgroup -S pihole -g ${PIHOLE_GID} && adduser -S pihole -G pihole -u ${PIHOLE_UID}
 
 COPY --chmod=0755 bash_functions.sh /usr/bin/bash_functions.sh

src/bash_functions.sh

@@ -95,15 +95,6 @@ start_cron() {
     echo ""
 }
 
-install_logrotate() {
-    # Install the logrotate config file - this is done already in Dockerfile
-    # but if a user has mounted a volume over /etc/pihole, it will have been lost
-    # pihole-FTL-prestart.sh will set the ownership of the file to root:root
-    echo "  [i] Ensuring logrotate script exists in /etc/pihole"
-    install -Dm644 -t /etc/pihole /etc/.pihole/advanced/Templates/logrotate
-    echo ""
-}
-
 migrate_gravity() {
     echo "  [i] Gravity migration checks"
     gravityDBfile=$(getFTLConfigValue files.gravity)

src/start.sh

@@ -45,9 +45,6 @@ start() {
     # Start crond for scheduled scripts (logrotate, pihole flush, gravity update etc)
     start_cron
 
-    # Install the logrotate config file
-    install_logrotate
-
     #migrate Gravity Database if needed:
     migrate_gravity
 

test/test_default.bats

@@ -55,7 +55,7 @@ teardown_file() {
 }
 
 @test "Logrotate config is installed" {
-    run docker exec "$CONTAINER" test -f /etc/pihole/logrotate
+    run docker exec "$CONTAINER" test -f /etc/logrotate.d/pihole
     assert_success
 }