From 22eaba3b6a425605e183767967806789d4e87a59 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.github@doesthisthing.work>
Date: Mon, 29 Jun 2020 16:00:04 +0200
Subject: [PATCH] Set MySQL user password

---
 compose.yml | 47 +++++++++++++++++++++++++++++++----------------
 helpers.sh  |  1 +
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/compose.yml b/compose.yml
index 048f559..bfb81ce 100644
--- a/compose.yml
+++ b/compose.yml
@@ -4,51 +4,66 @@ services:
   nextcloud:
     image: nextcloud:latest
     depends_on:
-      - maindb
+      - mariadb
     secrets:
       - db_root_password
+      - db_password
     environment:
-      - MYSQL_HOST=maindb:3306
+      - MYSQL_HOST=mariadb
       - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=root
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
+      - MYSQL_USER=nextcloud
+      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_password
       - DOMAIN=${DOMAIN}
     volumes:
-      - /mnt/nextcloud:/var/www/html:cached
-      - /mnt/nextapps:/var/www/html/custom_apps:cached
-      - /mnt/nextdata:/var/www/html/data:cached
-      - /mnt/nextconfig:/var/www/html/config:cached
+      - nextcloud:/var/www/html
+      - nextapps:/var/www/html/custom_apps:cached
+      - nextdata:/var/www/html/data:cached
+      - nextconfig:/var/www/html/config:cached
     networks:
       - proxy
       - internal
     deploy:
-      placement:
-        constraints: [node.role == worker]
-      update_config:
-        parallelism: 2
-        delay: 10s
       restart_policy:
         condition: on-failure
       labels:
         - "traefik.enable=true"
         - "traefik.docker.network=proxy"
         - "traefik.http.routers.nextcloud.tls=true"
-        - "traefik.http.routers.nextcloud.entrypoints=websecure"
         - "traefik.http.services.nextcloud.loadbalancer.server.port=80"
         - "traefik.http.routers.nextcloud.rule=Host(`${DOMAIN}`)"
-        - "traefik.http.routers.nextcloud.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "traefik.http.routers.myroutename.tls.certresolver=staging"
+        #- "traefik.http.routers.nextcloud.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.nextcloud.entrypoints=web-secure"
+        - "traefik.http.routers.nextcloud.tls.certresolver=staging"
+
+  mariadb:
+    image: "mariadb:10.5"
+    environment:
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+      - MYSQL_PASSWORD_FILE=/run/secrets/db_passwd
+      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
+    secrets:
+      - db_root_password
+      - db_password
+    volumes:
+      - "mariadb:/var/lib/mariadb"
+    networks:
+      - internal
 
 secrets:
   db_root_password:    
     external: true 
     name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}
+  db_password:    
+    external: true 
+    name: ${STACK_NAME}_db_passwd_${DB_ROOT_PASSWD_VERSION}
 
 volumes:
   nextcloud:
   nextapps:
   nextdata:
   nextconfig:
+  mariadb:
 
 networks:
   proxy:
diff --git a/helpers.sh b/helpers.sh
index a7dc778..54e8deb 100755
--- a/helpers.sh
+++ b/helpers.sh
@@ -2,4 +2,5 @@
 
 create-secrets () {
   pwgen -n 32 1  | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" -
+  pwgen -n 32 1  | docker secret create "${STACK_NAME}_db_passwd_${DB_ROOT_PASSWD_VERSION}" -
 }