docker: fix letsencrypt not persistent

nextcloud · Sep 21, 2018 · 9ee4282 · 9ee4282
1 parent 7443425
commit 9ee4282
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 
-[v0.59.15](https://github.com/nextcloud/nextcloudpi/commit/5498397) (2018-09-17) Don't overwrite an existing mail_smtpmode, if it is not "PHP"
+[v0.59.17](https://github.com/nextcloud/nextcloudpi/commit/620be82) (2018-09-09) docker: fix letsencrypt not persistent
+
+[v0.59.15](https://github.com/nextcloud/nextcloudpi/commit/41f21fa) (2018-09-17) Don't overwrite an existing mail_smtpmode, if it is not "PHP"
 
 [v0.59.14](https://github.com/nextcloud/nextcloudpi/commit/1420348) (2018-09-18) spDYN: fix misspelled variables
 

diff --git a/docker-common/nextcloudpi/000ncp b/docker-common/nextcloudpi/000ncp
@@ -5,7 +5,7 @@ source /usr/local/etc/library.sh
 # INIT NCP CONFIG (first run)
 persistent_cfg /usr/local/etc/ncp-config.d /data/ncp
 persistent_cfg /etc/services-enabled.d
-persistent_cfg /etc/letsencrypt/live               # persist SSL certificates
+persistent_cfg /etc/letsencrypt                    # persist SSL certificates
 persistent_cfg /etc/shadow                         # persist ncp-web password
 persistent_cfg /etc/cron.d
 persistent_cfg /etc/cron.daily

diff --git a/update.sh b/update.sh
@@ -117,10 +117,27 @@ chmod 770                  /var/www/ncp-web
 
   # docker images only
   [[ -f /.docker-image ]] && {
-    # install curl for dynDNS and duckDNS
-    [[ -f /usr/bin/curl ]] || {
-      apt-get update
-      apt-get install -y --no-install-recommends curl
+    [[ -e /data/etc/live ]] && {
+     cat > /etc/services-available.d/000ncp <<EOF
+#!/bin/bash
+
+source /usr/local/etc/library.sh
+
+# INIT NCP CONFIG (first run)
+persistent_cfg /usr/local/etc/ncp-config.d /data/ncp
+persistent_cfg /etc/services-enabled.d
+persistent_cfg /etc/letsencrypt                    # persist SSL certificates
+persistent_cfg /etc/shadow                         # persist ncp-web password
+persistent_cfg /etc/cron.d
+persistent_cfg /etc/cron.daily
+persistent_cfg /etc/cron.hourly
+persistent_cfg /etc/cron.weekly
+
+exit 0
+EOF
+      /etc/services-available.d/000ncp
+      rm /data/etc/letsencrypt/live
+      mv /data/etc/live /data/etc/letsencrypt
     }
   }