From 06819bdd51c07370f328b468bf50b3c4781df98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Tue, 31 Oct 2023 21:16:05 +0100 Subject: [PATCH] Install logrotate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- src/Dockerfile | 4 +++- src/bash_functions.sh | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index d2f0518..c39caa0 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -22,6 +22,7 @@ RUN apk add --no-cache \ iproute2-ss \ jq \ libcap \ + logrotate \ ncurses \ nmap-ncat \ procps-ng \ @@ -62,7 +63,8 @@ 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 -Dm755 -t /etc/pihole ./advanced/Templates/logrotate && \ + install -Dm644 -t /etc/pihole ./advanced/Templates/logrotate && \ + install -Dm755 -d /var/log/pihole && \ install -Dm755 -t /usr/local/bin pihole && \ install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole && \ install -T -m 0755 ./advanced/Templates/pihole-FTL-prestart.sh /opt/pihole/pihole-FTL-prestart.sh && \ diff --git a/src/bash_functions.sh b/src/bash_functions.sh index 61ccd11..8ef0d10 100644 --- a/src/bash_functions.sh +++ b/src/bash_functions.sh @@ -36,9 +36,6 @@ setFTLConfigValue() { ensure_basic_configuration() { echo " [i] Ensuring basic configuration by re-running select functions from basic-install.sh" - # TODO: - # installLogrotate || true #installLogRotate can return 2 or 3, but we are still OK to continue in that case - mkdir -p /var/run/pihole /var/log/pihole touch /var/log/pihole/FTL.log /var/log/pihole/pihole.log chown -R pihole:pihole /var/run/pihole /var/log/pihole