diff options
| author | nachoparker <nacho@ownyourbits.com> | 2018-06-19 15:00:20 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2018-06-19 18:19:15 +0300 |
| commit | c727d65c3c900e610aa5ac93ce24aec84aa48c09 (patch) | |
| tree | 100746a54f6e747f2987ca28f7ef2f26697c4b61 | |
| parent | 683cbc89c0c61fca778c3507a9e3d07f1f968f2c (diff) | |
docker: fix persist ncp-web passwordv0.57.7
| -rw-r--r-- | changelog.md | 6 | ||||
| -rwxr-xr-x | docker-common/nextcloudpi/000ncp | 1 | ||||
| -rw-r--r-- | etc/library.sh | 2 | ||||
| -rw-r--r-- | etc/ncp-config.d/nc-passwd.sh | 9 |
4 files changed, 14 insertions, 4 deletions
diff --git a/changelog.md b/changelog.md index 1ae608fe..fdd53ca4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v0.57.6](https://github.com/nextcloud/nextcloudpi/commit/8ab0187) (2018-06-19) fix mysqld service named mysql +[v0.57.7](https://github.com/nextcloud/nextcloudpi/commit/619812c) (2018-06-19) docker: fix persist ncp-web password -[v0.57.5](https://github.com/nextcloud/nextcloudpi/commit/e75b574) (2018-06-18) fix nextcloud-domain running before default GW is ready +[v0.57.6 ](https://github.com/nextcloud/nextcloudpi/commit/9d0d3b3) (2018-06-19) fix mysqld service named mysql + +[v0.57.5 ](https://github.com/nextcloud/nextcloudpi/commit/e75b574) (2018-06-18) fix nextcloud-domain running before default GW is ready [v0.57.4 ](https://github.com/nextcloud/nextcloudpi/commit/ce2d38c) (2018-06-18) letsencrypt: install from debian package diff --git a/docker-common/nextcloudpi/000ncp b/docker-common/nextcloudpi/000ncp index 6e1f9f39..bc4b333f 100755 --- a/docker-common/nextcloudpi/000ncp +++ b/docker-common/nextcloudpi/000ncp @@ -6,7 +6,6 @@ source /usr/local/etc/library.sh persistent_cfg /usr/local/etc/ncp-config.d /data/ncp persistent_cfg /etc/services-enabled.d persistent_cfg /etc/letsencrypt/live # persist SSL certificates -# TODO persistent_cfg /etc/shadow # persist ncp-web password exit 0 diff --git a/etc/library.sh b/etc/library.sh index dc3fe457..6d9b4a97 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -179,7 +179,7 @@ function persistent_cfg() local DST="${2:-/data/etc/$( basename "$SRC" )}" test -e /changelog.md && return # trick to disable in dev docker mkdir -p "$( dirname "$DST" )" - test -d "$DST" || { + test -e "$DST" || { echo "Making $SRC persistent ..." mv "$SRC" "$DST" } diff --git a/etc/ncp-config.d/nc-passwd.sh b/etc/ncp-config.d/nc-passwd.sh index 4d9243ee..89fdaba2 100644 --- a/etc/ncp-config.d/nc-passwd.sh +++ b/etc/ncp-config.d/nc-passwd.sh @@ -15,9 +15,18 @@ DESCRIPTION="Change password for the NextCloudPi Panel" configure() { + # update password echo -e "$PASSWORD_\n$CONFIRM_" | passwd ncp &>/dev/null && \ echo "password updated successfully" || \ { echo "passwords do not match"; return 1; } + + # persist ncp-web password in docker container + [[ -f /.docker-image ]] && { + mv /etc/shadow /data/etc/shadow + ln -s /data/etc/shadow /etc/shadow + } + + # activate NCP a2ensite ncp nextcloud a2dissite ncp-activation bash -c "sleep 1.5 && service apache2 reload" &>/dev/null & |