From 42eb811910ddb2fcd4a39a1a49b922686126ebce Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 17 May 2017 12:54:43 +0200 Subject: [PATCH] Add "quiet" mode + update comments in the cron file --- advanced/Scripts/piholeLogFlush.sh | 7 ++++++- advanced/pihole.cron | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/advanced/Scripts/piholeLogFlush.sh b/advanced/Scripts/piholeLogFlush.sh index 9801d8ac..cc553b32 100755 --- a/advanced/Scripts/piholeLogFlush.sh +++ b/advanced/Scripts/piholeLogFlush.sh @@ -8,6 +8,9 @@ # This file is copyright under the latest version of the EUPL. # Please see LICENSE file for your rights under this license. +if [[ "$@" != *"quiet"* ]]; then + echo -n "::: Flushing /var/log/pihole.log ..." +fi if [[ "$@" == *"once"* ]]; then # Nightly logrotation if command -v /usr/sbin/logrotate >/dev/null; then @@ -24,7 +27,6 @@ if [[ "$@" == *"once"* ]]; then fi else # Manual flushing - echo -n "::: Flushing /var/log/pihole.log ..." if command -v /usr/sbin/logrotate >/dev/null; then # Logrotate twice to move all data out of sight of FTL /usr/sbin/logrotate --force /etc/pihole/logrotate; sleep 3 @@ -36,5 +38,8 @@ else echo " " > /var/log/pihole.log.1 fi fi +fi + +if [[ "$@" != *"quiet"* ]]; then echo "... done!" fi diff --git a/advanced/pihole.cron b/advanced/pihole.cron index be35dc50..f1beb08c 100644 --- a/advanced/pihole.cron +++ b/advanced/pihole.cron @@ -21,9 +21,10 @@ # Pi-hole: Update Pi-hole! Uncomment to enable auto update #30 2 * * 7 root PATH="$PATH:/usr/local/bin/" pihole updatePihole -# Pi-hole: Flush the log daily at 00:00 so it doesn't get out of control -# Stats will be viewable in the Web interface thanks to the cron job above +# Pi-hole: Flush the log daily at 00:00 # The flush script will use logrotate if available -00 00 * * * root PATH="$PATH:/usr/local/bin/" pihole flush once +# parameter "once": logrotate only once (default is twice) +# parameter "quiet": don't print messages +00 00 * * * root PATH="$PATH:/usr/local/bin/" pihole flush once quiet @reboot root /usr/sbin/logrotate /etc/pihole/logrotate