diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-09-21 21:15:12 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-09-22 09:48:56 +0300 |
| commit | 1046a2413be5d2e55a516b34f9067a7ededf1e6e (patch) | |
| tree | bcd8590dbeb39c6e8d5f1768ca0963967aefdc48 | |
| parent | 98976c91b36770d9f1a22f3fba93d8cc7333a94f (diff) | |
letsencrypt: fix active status checkv1.39.8
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/NETWORKING/letsencrypt.sh | 3 | ||||
| -rw-r--r-- | changelog.md | 22 | ||||
| -rw-r--r-- | etc/ncp-templates/nextcloud.conf.sh | 2 |
3 files changed, 24 insertions, 3 deletions
diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh index a70b06c1..f2e48ae2 100644 --- a/bin/ncp/NETWORKING/letsencrypt.sh +++ b/bin/ncp/NETWORKING/letsencrypt.sh @@ -21,7 +21,7 @@ is_active() tmpl_letsencrypt_domain() { ( . /usr/local/etc/library.sh - if is_active; then + if is_active_app letsencrypt; then find_app_param letsencrypt DOMAIN fi ) @@ -50,7 +50,6 @@ EOF return 0 } -# tested with certbot 0.28.0 configure() { [[ "${ACTIVE}" != "yes" ]] && { diff --git a/changelog.md b/changelog.md index 7fd1e89c..6682743c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,29 @@ +<<<<<<< HEAD [v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/5ba3e68) (2021-09-22) dont update config if Redis is not yet ready +======= +<<<<<<< HEAD +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/ef88f48) (2021-09-22) dont update config if Redis is not yet ready +>>>>>>> 37f01dc (letsencrypt: fix active status check) [v1.39.6 ](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine +======= +<<<<<<< HEAD +<<<<<<< HEAD +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/ef88f48) (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 +======= +======= +>>>>>>> 3c905ea (letsencrypt: fix active status check) +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/a6fd394) (2021-09-22) dont update config if Redis is not yet ready +======= +[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/c651cf8) (2021-09-21) letsencrypt: fix active status check +>>>>>>> a07ddd2 (letsencrypt: fix active status check) + +[v1.39.6](https://github.com/nextcloud/nextcloudpi/commit/534b9b5) (2021-09-19) ncp-update-nc: pre-check that NC is currently working fine +>>>>>>> f289443 (dont update config if Redis is not yet ready) +>>>>>>> 6b852d2 (letsencrypt: fix active status check) [v1.39.5 ](https://github.com/nextcloud/nextcloudpi/commit/cb184d2) (2021-09-19) ncp-update-nc: dont keep notifying when there is nothing to upgrade diff --git a/etc/ncp-templates/nextcloud.conf.sh b/etc/ncp-templates/nextcloud.conf.sh index 196e56c8..464b0db5 100644 --- a/etc/ncp-templates/nextcloud.conf.sh +++ b/etc/ncp-templates/nextcloud.conf.sh @@ -13,7 +13,7 @@ if [[ "$1" != "--defaults" ]]; then )" fi -if [[ "$DOCKERBUILD" != 1 ]] && [[ "$1" != "--defaults" ]]; then +if [[ -f /.docker-image ]] && [[ "$1" != "--defaults" ]]; then METRICS_IS_ENABLED="$( source "${BINDIR}/SYSTEM/metrics.sh" tmpl_metrics_enabled && echo yes || echo no |