diff --git a/lib/functions.sh b/lib/functions.sh index 9fb8b1f..639cc7f 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -101,7 +101,9 @@ EOF (crontab -l 2>/dev/null; echo "30 22 * * * date >> /federated/logs/backup.log && /federated/bin/backuptool -b all >> /federated/logs/backup.log 2>&1") | sort -u | crontab - (crontab -l 2>/dev/null; echo "0 2 * * * date >> /federated/logs/upgrade.log && /federated/bin/upgrade >> /federated/logs/upgrade.log 2>&1") | sort -u | crontab - (crontab -l 2>/dev/null; echo "0 3 * * * date >> /federated/logs/dumpcerts.log && /federated/bin/dumpcerts >> /federated/logs/dumpcerts.log 2>&1") | sort -u | crontab - - (crontab -l 2>/dev/null; echo "*/5 * * * * /usr/bin/docker exec -u 33 nextcloud php -f /var/www/html/cron.php") | sort -u | crontab - + if [[ "${PLUS}" = "false" ]]; then + (crontab -l 2>/dev/null; echo "*/5 * * * * /usr/bin/docker exec -u 33 nextcloud php -f /var/www/html/cron.php") | sort -u | crontab - + fi } install_federated() { # Check if Federated is already installed then install @@ -1769,10 +1771,12 @@ config_network() { kill -9 $SPINPID &> /dev/null } run_finishtasks() { - docker exec -u 33 nextcloud php -f /var/www/html/cron.php - docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0 - docker exec -u 33 nextcloud php -f /var/www/html/cron.php - docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0 + if [[ "${PLUS}" = "false" ]]; then + docker exec -u 33 nextcloud php -f /var/www/html/cron.php + docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0 + docker exec -u 33 nextcloud php -f /var/www/html/cron.php + docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0 + fi docker system prune -a -f } add_authelia_config_to_dockercompose() { diff --git a/lib/listmonk.sh b/lib/listmonk.sh index ca42ded..b505d15 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -109,8 +109,7 @@ start_listmonk() { # Start service with command to make sure it's up before proceeding start_service "listmonk" "nc -z 192.168.0.21 9000 &> /dev/null" "8" - docker exec pdns pdnsutil add-record $DOMAIN listmonk A 86400 $EXTERNALIP &> /dev/null - [ $? -ne 0 ] && fail "Couldn't add dns record" + [[ "${PLUS}" = "false" ]] && docker exec pdns pdnsutil add-record $DOMAIN listmonk A 86400 $EXTERNALIP &> /dev/null echo -ne "done." }