docker: fix provisioning on a stopped the containerv0.64.12

5 files changed, 10 insertions, 2 deletions

diff --git a/bin/ncp-provisioning.sh b/bin/ncp-provisioning.sh
index ed6be0c8..c905a01b 100644
--- a/bin/ncp-provisioning.sh
+++ b/bin/ncp-provisioning.sh
@@ -38,6 +38,7 @@ GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
 DROP USER '$DBADMIN'@'localhost';
 CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
 GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
+FLUSH PRIVILEGES;
 EXIT
 EOF
 }
diff --git a/changelog.md b/changelog.md
index 0382d4f9..da6bf688 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
 
-[v0.64.11](https://github.com/nextcloud/nextcloudpi/commit/89218e5) (2018-10-27) check for path transversal
+[v0.64.12](https://github.com/nextcloud/nextcloudpi/commit/293c2c7) (2018-11-03) docker: fix provisioning on a stopped the container
+
+[v0.64.11](https://github.com/nextcloud/nextcloudpi/commit/1758331) (2018-10-27) check for path transversal
 
 [v0.64.10](https://github.com/nextcloud/nextcloudpi/commit/26083e9) (2018-10-24) update: update sources
 
diff --git a/docker-common/lamp/010lamp b/docker-common/lamp/010lamp
index a2b4af6b..5bb2dbaa 100755
--- a/docker-common/lamp/010lamp
+++ b/docker-common/lamp/010lamp
@@ -2,6 +2,8 @@
 
 source /usr/local/etc/library.sh
 
+PHPVER=7.2
+
 set -e
 
 [[ "$1" == "stop" ]] && {
diff --git a/docker-common/nextcloud/020nextcloud b/docker-common/nextcloud/020nextcloud
index 2fbe11e7..3521b789 100755
--- a/docker-common/nextcloud/020nextcloud
+++ b/docker-common/nextcloud/020nextcloud
@@ -43,6 +43,8 @@ test -f /data/app/config/config.php || {
 # Better do real provisioning at the end, as it can restart PHP asynchronously
 sed -i "s|'password'.*|'password' => 'default',|"        /data/app/config/config.php
 sed -i "s|'dbpassword' =>.*|'dbpassword' => 'default',|" /data/app/config/config.php
+echo -e "[client]\npassword=default" > /root/.my.cnf
+chmod 600 /root/.my.cnf
 DBPASSWD=default
 DBADMIN=ncadmin
 mysql <<EOF
@@ -50,6 +52,7 @@ GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
 DROP USER '$DBADMIN'@'localhost';
 CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
 GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
+FLUSH PRIVILEGES;
 EXIT
 EOF
 
diff --git a/update.sh b/update.sh
index 698ef844..4e563db0 100755
--- a/update.sh
+++ b/update.sh
@@ -98,7 +98,7 @@ chmod 770                  /var/www/ncp-web
   for opt in $EXCL_DOCKER; do rm $CONFDIR/$opt; done
 
   # update services
-  cp docker-common/{lamp/010lamp,nextcloud/020nextcloud,nextcloudpi/000ncp} /etc/services-available.d
+  cp docker-common/{lamp/010lamp,nextcloud/020nextcloud,nextcloudpi/000ncp} /etc/services-enabled.d
 
 }