diff --git a/docker-pi-hole.cron b/docker-pi-hole.cron index e7d4382..71d1c92 100644 --- a/docker-pi-hole.cron +++ b/docker-pi-hole.cron @@ -11,19 +11,20 @@ # Your container name goes here: DOCKER_NAME=pihole +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # Pi-hole: Update the ad sources once a week on Sunday at 01:59 # Download any updates from the adlists -59 1 * * 7 root docker exec -it $DOCKER_NAME pihole updateGravity +59 1 * * 7 root docker exec $DOCKER_NAME pihole updateGravity > /dev/null # Pi-hole: Update the Web interface shortly after gravity runs # This should also update the version number if it is changed in the dashboard repo -#30 2 * * 7 root docker exec -it $DOCKER_NAME pihole updateDashboard +#30 2 * * 7 root docker exec $DOCKER_NAME pihole updateDashboard > /dev/null # Pi-hole: Parse the log file before it is flushed and save the stats to a database # This will be used for a historical view of your Pi-hole's performance -#50 23 * * * root docker exec -it $DOCKER_NAME dailyLog.sh # note: this is outdated +#50 23 * * * root docker exec $DOCKER_NAME dailyLog.sh # note: this is outdated > /dev/null # Pi-hole: Flush the log daily at 11:58 so it doesn't get out of control # Stats will be viewable in the Web interface thanks to the cron job above -58 23 * * * root docker exec -it $DOCKER_NAME pihole flush +58 23 * * * root docker exec $DOCKER_NAME pihole flush > /dev/null diff --git a/update.sh b/update.sh index 29f7ca4..07980a3 100755 --- a/update.sh +++ b/update.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x # Grab newest code and update version files git submodule foreach git pull origin master; @@ -12,7 +12,8 @@ sed -i 's|service dnsmasq start|dnsmasq -7 /etc/dnsmasq.d|g' alpine/gravity.sh # Copy latest crontab and modify to use docker exec commands cron='./docker-pi-hole.cron' cp -f pi-hole/advanced/pihole.cron ${cron}; -sed -i '/Update the ad sources/ i\# Your container name goes here:\nDOCKER_NAME=pihole\n' ${cron}; -sed -i 's|/usr/local/bin/|docker exec -it $DOCKER_NAME |g' ${cron}; +sed -i '/Update the ad sources/ i\# Your container name goes here:\nDOCKER_NAME=pihole\nPATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n' ${cron}; +sed -i 's|/usr/local/bin/|docker exec $DOCKER_NAME |g' ${cron}; +sed -i '/docker exec/ s|$| > /dev/null|g' ${cron}; # docker-pi-hole users update their docker images, not git code sed -i '/pihole updateDashboard/ s/^/#/' ${cron};