From 4c836bf231cbae74987ee66498f784cd35334ebd Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Jan 2025 14:51:23 +0000 Subject: [PATCH] Fixed PLUS changes not equal true --- lib/functions.sh | 4 ++-- lib/listmonk.sh | 2 +- lib/postgresql.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/functions.sh b/lib/functions.sh index 639cc7f..b62c8bf 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -101,7 +101,7 @@ 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 - - if [[ "${PLUS}" = "false" ]]; then + if [[ "${PLUS}" != "true" ]]; 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 } @@ -1771,7 +1771,7 @@ config_network() { kill -9 $SPINPID &> /dev/null } run_finishtasks() { - if [[ "${PLUS}" = "false" ]]; then + if [[ "${PLUS}" != "true" ]]; 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 diff --git a/lib/listmonk.sh b/lib/listmonk.sh index ddef7ae..ea067f8 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -112,7 +112,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" - [[ "${PLUS}" = "false" ]] && docker exec pdns pdnsutil add-record $DOMAIN listmonk A 86400 $EXTERNALIP &> /dev/null + [[ "${PLUS}" != "true" ]] && docker exec pdns pdnsutil add-record $DOMAIN listmonk A 86400 $EXTERNALIP &> /dev/null echo -ne "done." } diff --git a/lib/postgresql.sh b/lib/postgresql.sh index e92c78c..11e0539 100644 --- a/lib/postgresql.sh +++ b/lib/postgresql.sh @@ -19,7 +19,7 @@ config_postgresql() { if [ ! -d "/federated/apps/postgresql" ]; then mkdir -p /federated/apps/postgresql/data/var/lib/postgresql /federated/apps/postgresql/data/docker-entrypoint-initdb.d - if [[ "${PLUS}" = "false" ]]; then + if [[ "${PLUS}" != "true" ]]; then cp /federated/certs/certs/$DOMAIN.crt /federated/apps/postgresql/data/var/lib/postgresql/server.crt cp /federated/certs/private/$DOMAIN.key /federated/apps/postgresql/data/var/lib/postgresql/server.key chown 999 /federated/apps/postgresql/data/var/lib/postgresql/server.crt /federated/apps/postgresql/data/var/lib/postgresql/server.key @@ -27,7 +27,7 @@ config_postgresql() { fi fi -if [[ "${PLUS}" = "false" ]]; then +if [[ "${PLUS}" != "true" ]]; then cat > /federated/apps/postgresql/docker-compose.yml <