Add Nextcloud password salt and secret to setup

docker-compose.yml

@@ -127,6 +127,14 @@ services:
       - source: db_pwd
         target: mysql_pwd
         mode: 0440
+      - source: nextcloud_salt
+        target: salt
+        uid: '999'
+        mode: 0440
+      - source: nextcloud_secret
+        target: secret
+        uid: '999'
+        mode: 0440
     env_file:
       - nextcloud.env
     networks:
@@ -187,6 +195,10 @@ secrets:
     external: true
   nextcloud_admin_pwd:
     external: true
+  nextcloud_salt:
+    external: true
+  nextcloud_secret:
+    external: true
   zoneminder_admin_pwd:
     external: true
 networks:

nextcloud.env.template

@@ -1,6 +1,8 @@
 NEXTCLOUD_DOMAIN=${DOMAIN}
 NEXTCLOUD_SERVER_NAME=nextcloud
 NEXTCLOUD_ADMIN_PWD_FILE=/run/secrets/admin_pwd
+NEXTCLOUD_SALT_FILE=/run/secrets/salt
+NEXTCLOUD_SECRET_FILE=/run/secrets/secret
 DATA_CHOWN=1
 # LDAP
 LDAP_SERVER_HOST=openldap

setup.sh

@@ -54,6 +54,11 @@ if [[ ${#nextcloud_admin_pwd} -eq 0 ]]; then
     nextcloud_admin_pwd=`eval "$PWD_GEN"`
 fi
 
+echo "If you have a password salt and a secret from a previous installation, provide them here."
+echo "They are used by Passman and need to remain the same for the vaults to be accessible"
+read -p "Nextcloud Pwd Salt (a random one will be generated by NC if empty): " nextcloud_salt
+read -p "Nextcloud Secret (a random one will be generated by NC if empty): " nextcloud_secret
+
 read -p "Zoneminder Admin User Pwd (a random one will be generated if empty): " zoneminder_admin_pwd
 if [[ ${#zoneminder_admin_pwd} -eq 0 ]]; then
     zoneminder_admin_pwd=`eval "$PWD_GEN"`
@@ -86,6 +91,8 @@ echo $ldap_pwd | docker secret create ldap_pwd -
 echo $ldap_mail_pwd | docker secret create ldap_mail_pwd -
 echo $ldap_nextcloud_pwd | docker secret create ldap_nextcloud_pwd -
 echo $nextcloud_admin_pwd | docker secret create nextcloud_admin_pwd -
+echo $nextcloud_salt | docker secret create nextcloud_salt -
+echo $nextcloud_secret | docker secret create nextcloud_secret -
 echo $zoneminder_admin_pwd | docker secret create zoneminder_admin_pwd -
 
 echo $'\E[33m'
@@ -133,7 +140,7 @@ sudo mkdir -p ${DB_DATA_PATH}
 #sudo mkdir -p ${DB_CONFIG_PATH}
 # mail
 sudo mkdir -p ${MAIL_DATA_PATH}
-sudo mkdir -p ${MAIL_STATE_PATH}
+#sudo mkdir -p ${MAIL_STATE_PATH}
 # nextcloud
 sudo mkdir -p ${NEXTCLOUD_DATA_PATH}
 sudo mkdir -p ${NEXTCLOUD_BACKUP_PATH}