From d49a531162422e4515a5cc0a24e6b121e09f02ac Mon Sep 17 00:00:00 2001
From: Jonas Thelemann <e-mail@jonas-thelemann.de>
Date: Tue, 24 Mar 2020 04:06:52 +0100
Subject: [PATCH] nextcloud: Fix "content.md"

---
 nextcloud/content.md | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/nextcloud/content.md b/nextcloud/content.md
index 187f99709..5c4672c56 100644
--- a/nextcloud/content.md
+++ b/nextcloud/content.md
@@ -271,11 +271,13 @@ services:
     volumes:
       - db:/var/lib/postgresql/data
     environment:
-      - POSTGRES_DB=nextcloud
-      - POSTGRES_USER=nextcloud
+      - POSTGRES_DB_FILE=/run/secrets/postgres_db
+      - POSTGRES_USER_FILE=/run/secrets/postgres_user
       - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
     secrets:
+      - postgres_db
       - postgres_password
+      - postgres_user
 
   app:
     image: nextcloud
@@ -286,29 +288,38 @@ services:
       - nextcloud:/var/www/html
     environment:
       - POSTGRES_HOST=db
-      - POSTGRES_DB=nextcloud
-      - POSTGRES_USER=nextcloud
+      - POSTGRES_DB_FILE=/run/secrets/postgres_db
+      - POSTGRES_USER_FILE=/run/secrets/postgres_user
       - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
-      - NEXTCLOUD_ADMIN_USER=superuser
-      - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
+      - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+      - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
     depends_on:
       - db
     secrets:
+      - nextcloud_admin_password
+      - nextcloud_admin_user
+      - postgres_db
       - postgres_password
-      - admin_password
+      - postgres_user
 
 volumes:
   db:
   nextcloud:
 
 secrets:
+  nextcloud_admin_password:
+    file: ./nextcloud_admin_password.txt # put admin password to this file
+  nextcloud_admin_user:
+    file: ./nextcloud_admin_user.txt # put admin username to this file
+  postgres_db:
+    file: ./postgres_db.txt # put postgresql db name to this file
   postgres_password:
     file: ./postgres_password.txt # put postgresql password to this file
-  admin_password:
-    file: ./admin_password.txt # put admin password to this file
+  postgres_user:
+    file: ./postgres_user.txt # put postgresql username to this file
 ```
 
-Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `MYSQL_PASSWORD`, `POSTGRES_PASSWORD`.
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
 
 # Make your Nextcloud available from the internet