Skip to content

Commit 2b51476

Browse files
committed
fix inverted template logic for docker
Signed-off-by: nachoparker <nacho@ownyourbits.com>
1 parent a4851dc commit 2b51476

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

changelog.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<<<<<<< HEAD
1212
<<<<<<< HEAD
1313
<<<<<<< HEAD
14+
<<<<<<< HEAD
1415
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/ef88f48) (2021-09-22) dont update config if Redis is not yet ready
1516

1617
[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 @@
1920
>>>>>>> 3c905ea (letsencrypt: fix active status check)
2021
=======
2122
>>>>>>> bac07b7 (letsencrypt: fix renewal with httpsonly enabled)
23+
=======
24+
>>>>>>> 2060cc8 (fix inverted template logic for docker)
2225
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/a6fd394) (2021-09-22) dont update config if Redis is not yet ready
2326
=======
2427
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/c651cf8) (2021-09-21) letsencrypt: fix active status check
2528
>>>>>>> a07ddd2 (letsencrypt: fix active status check)
2629
=======
30+
=======
31+
>>>>>>> 9ece76e (fix inverted template logic for docker)
2732
[v1.39.7](https://github.com/nextcloud/nextcloudpi/commit/c651cf8) (2021-09-21) letsencrypt: fix active status check
2833
=======
2934
[v1.39.9](https://github.com/nextcloud/nextcloudpi/commit/836d66d) (2021-09-21) letsencrypt: fix renewal with httpsonly enabled
35+
=======
36+
[v1.39.10](https://github.com/nextcloud/nextcloudpi/commit/27e7d06) (2021-09-21) fix inverted template logic for docker
37+
38+
[v1.39.9 ](https://github.com/nextcloud/nextcloudpi/commit/afeb957) (2021-09-21) letsencrypt: fix renewal with httpsonly enabled
39+
>>>>>>> 215574b (fix inverted template logic for docker)
3040
3141
[v1.39.8](https://github.com/nextcloud/nextcloudpi/commit/6fca91c) (2021-09-21) letsencrypt: take into account duplicate domains ending in -0001
3242

etc/ncp-templates/nextcloud.conf.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [[ "$1" != "--defaults" ]]; then
1313
)"
1414
fi
1515

16-
if [[ -f /.docker-image ]] && [[ "$1" != "--defaults" ]]; then
16+
if ! [[ -f /.docker-image ]] && [[ "$1" != "--defaults" ]]; then
1717
METRICS_IS_ENABLED="$(
1818
source "${BINDIR}/SYSTEM/metrics.sh"
1919
tmpl_metrics_enabled && echo yes || echo no

0 commit comments

Comments
 (0)