diff options
| author | nachoparker <nacho@ownyourbits.com> | 2021-09-21 23:15:51 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-09-22 09:48:57 +0300 |
| commit | 2b514766301ec8fa05d3572103a094a32b566c19 (patch) | |
| tree | b92839f25e794e486328caeb8cb5afd774bf50de | |
| parent | a4851dcd310bd27e447e5ec61d074f164db26b54 (diff) | |
fix inverted template logic for dockerv1.39.10
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | changelog.md | 10 | ||||
| -rw-r--r-- | etc/ncp-templates/nextcloud.conf.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md index 1168180c..67b03b95 100644 --- a/changelog.md +++ b/changelog.md @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< 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 @@ -19,14 +20,23 @@ >>>>>>> 3c905ea (letsencrypt: fix active status check) ======= >>>>>>> bac07b7 (letsencrypt: fix renewal with httpsonly enabled) +======= +>>>>>>> 2060cc8 (fix inverted template logic for docker) [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) ======= +======= +>>>>>>> 9ece76e (fix inverted template logic for docker) [v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/c651cf8) (2021-09-21) letsencrypt: fix active status check ======= [v1.39.9](https://github.com/nextcloud/nextcloudpi/commit/836d66d) (2021-09-21) letsencrypt: fix renewal with httpsonly enabled +======= +[v1.39.10](https://github.com/nextcloud/nextcloudpi/commit/27e7d06) (2021-09-21) fix inverted template logic for docker + +[v1.39.9 ](https://github.com/nextcloud/nextcloudpi/commit/afeb957) (2021-09-21) letsencrypt: fix renewal with httpsonly enabled +>>>>>>> 215574b (fix inverted template logic for docker) [v1.39.8](https://github.com/nextcloud/nextcloudpi/commit/6fca91c) (2021-09-21) letsencrypt: take into account duplicate domains ending in -0001 diff --git a/etc/ncp-templates/nextcloud.conf.sh b/etc/ncp-templates/nextcloud.conf.sh index 464b0db5..6db58f16 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 [[ -f /.docker-image ]] && [[ "$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 |