diff options
author | nachoparker <nacho@ownyourbits.com> | 2018-09-10 06:03:58 +0300 |
---|---|---|
committer | nacho <nacho@ownyourbits.com> | 2018-09-21 05:07:09 +0300 |
commit | 9ee428280ac023bddbe2ed3b71da362f32d6de0d (patch) | |
tree | d078fec5004855eabac1587c4b2ce78dafcd800f | |
parent | 744342502b16d61dfb897d53ec0bd2887f0087da (diff) |
docker: fix letsencrypt not persistentv0.59.17
-rw-r--r-- | changelog.md | 4 | ||||
-rwxr-xr-x | docker-common/nextcloudpi/000ncp | 2 | ||||
-rwxr-xr-x | update.sh | 25 |
3 files changed, 25 insertions, 6 deletions
diff --git a/changelog.md b/changelog.md index 9d6f9dc4..6db78884 100644 --- 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 index 158e849d..2ff0ef32 100755 --- 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 @@ -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 } } |