From 814569be56e37ccf22ad0f6e2ba4fdc0c7cb2264 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Wed, 22 Sep 2021 09:38:25 -0600 Subject: [PATCH] fix junk in overwrite.cli.url because of Redis not being yet ready Signed-off-by: nachoparker --- bin/nextcloud-domain.sh | 3 +++ changelog.md | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/nextcloud-domain.sh b/bin/nextcloud-domain.sh index 332351335..395568896 100644 --- a/bin/nextcloud-domain.sh +++ b/bin/nextcloud-domain.sh @@ -23,6 +23,9 @@ while :; do sleep 3 continue } + # Fix the situation where junk was introduced in the config by mistake + # because Redis was not yet ready to be used even if it was up + [[ "${nc_domain}" =~ "RedisException" ]] && nc_domain="$(hostname)" set-nc-domain "${nc_domain}" >> /var/log/ncp.log break done diff --git a/changelog.md b/changelog.md index d803d97ff..ea87f8739 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v1.39.11](https://github.com/nextcloud/nextcloudpi/commit/43a6381) (2021-09-21) letsencrypt: take into account duplicate domains ending in -0001 +[v1.39.12](https://github.com/nextcloud/nextcloudpi/commit/43e19cc) (2021-09-22) fix junk in overwrite.cli.url because of Redis not being yet ready + +[v1.39.11](https://github.com/nextcloud/nextcloudpi/commit/4039da9) (2021-09-21) letsencrypt: take into account duplicate domains ending in -0001 [v1.39.10](https://github.com/nextcloud/nextcloudpi/commit/2b51476) (2021-09-21) fix inverted template logic for docker @@ -7,7 +9,7 @@ [v1.39.8 ](https://github.com/nextcloud/nextcloudpi/commit/1046a24) (2021-09-21) letsencrypt: fix active status check -[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/98976c9) (2021-09-22) dont update config if Redis is not yet ready +[v1.39.7 ](https://github.com/nextcloud/nextcloudpi/commit/98976c9) (2021-09-22) dont update config if Redis is not yet ready [v1.39.6 ](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine