From 30a8bdd213767a1f5d1ac129bc53a23799735549 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Tue, 13 Feb 2018 17:51:52 +0100 Subject: [PATCH] letsencrypt: only call update-rc.d in docker builds --- docker-armhf/debian-ncp/run-parts.sh | 2 +- docker/debian-ncp/run-parts.sh | 2 +- etc/nextcloudpi-config.d/letsencrypt.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-armhf/debian-ncp/run-parts.sh b/docker-armhf/debian-ncp/run-parts.sh index 6ebe5ba1d..e35ef2af7 100755 --- a/docker-armhf/debian-ncp/run-parts.sh +++ b/docker-armhf/debian-ncp/run-parts.sh @@ -20,7 +20,7 @@ test -f $FILE || { } [[ "$2" == "enable" ]] && { - ln -s $FILE /etc/services-enabled.d/$( basename $FILE ) + ln -sf $FILE /etc/services-enabled.d/$( basename $FILE ) echo "enabled $1" exit 0 } diff --git a/docker/debian-ncp/run-parts.sh b/docker/debian-ncp/run-parts.sh index 6ebe5ba1d..e35ef2af7 100755 --- a/docker/debian-ncp/run-parts.sh +++ b/docker/debian-ncp/run-parts.sh @@ -20,7 +20,7 @@ test -f $FILE || { } [[ "$2" == "enable" ]] && { - ln -s $FILE /etc/services-enabled.d/$( basename $FILE ) + ln -sf $FILE /etc/services-enabled.d/$( basename $FILE ) echo "enabled $1" exit 0 } diff --git a/etc/nextcloudpi-config.d/letsencrypt.sh b/etc/nextcloudpi-config.d/letsencrypt.sh index 5ed82753f..608896af9 100644 --- a/etc/nextcloudpi-config.d/letsencrypt.sh +++ b/etc/nextcloudpi-config.d/letsencrypt.sh @@ -92,7 +92,7 @@ EOF rm -rf $NCDIR/.well-known # update configuration - /usr/local/sbin/update-rc.d letsencrypt enable + [[ "$DOCKERBUILD" == 1 ]] && update-rc.d letsencrypt enable return 0 }