From 0de813ab447d6fb49ce51362b61da7ab28d1ed63 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Tue, 30 Jun 2020 12:39:32 +0200
Subject: [PATCH] Hard-code values without env vars

---
 compose.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/compose.yml b/compose.yml
index 6705474..4713bda 100644
--- a/compose.yml
+++ b/compose.yml
@@ -13,7 +13,7 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_password
-      - DOMAIN=${DOMAIN}
+      - DOMAIN=nextcloud.swarm.autonomic.zone
     volumes:
       - nextcloud:/var/www/html
       - nextapps:/var/www/html/custom_apps:cached
@@ -30,9 +30,8 @@ services:
         - "traefik.docker.network=proxy"
         - "traefik.http.routers.nextcloud.tls=true"
         - "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.nextcloud.tls.certresolver=staging"
+        - "traefik.http.routers.nextcloud.rule=Host(`nextcloud.swarm.autonomic.zone`)"
+        - "traefik.http.routers.nextcloud.tls.certresolver=production"
         - "traefik.http.routers.nextcloud.entrypoints=web-secure"
 
   mariadb:
@@ -51,12 +50,12 @@ services:
       - 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}
+  db_root_password:
+    external: true
+    name: nextcloud_db_root_passwd_v1
+  db_password:
+    external: true
+    name: nextcloud_db_passwd_v1
 
 volumes:
   nextcloud: