From 0a73f047335133a219620ae7e2cef8ecc0cc605b Mon Sep 17 00:00:00 2001
From: Mayel de Borniol <git@mayel.space>
Date: Wed, 9 Mar 2022 11:30:50 +1300
Subject: [PATCH] domain and db pw

---
 .env.sample |  5 +++--
 compose.yml | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.env.sample b/.env.sample
index 79cc480..55baac1 100644
--- a/.env.sample
+++ b/.env.sample
@@ -8,8 +8,8 @@ DB_DOCKER_IMAGE=postgres:12-alpine
 # DB_DOCKER_IMAGE=postgis/postgis:12-3.1-alpine
 
 # enter your instance's domain name
-HOSTNAME=bonfire.example.com
-# DO NOT CHANGE HOSTNAME AFTER DEPLOYMENT! WILL BREAK FEDERATION!!
+DOMAIN=bonfire.example.com
+# DO NOT CHANGE DOMAIN AFTER DEPLOYMENT! WILL BREAK FEDERATION!!
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.bonfire.example.com`'
 
@@ -72,3 +72,4 @@ ACME_AGREE=true
 SHOW_DEBUG_IN_DEV=true
 MIX_ENV=prod
 LETS_ENCRYPT_ENV=production
+HOSTNAME=$DOMAIN
\ No newline at end of file
diff --git a/compose.yml b/compose.yml
index bd0c6c3..f2b4c3f 100644
--- a/compose.yml
+++ b/compose.yml
@@ -27,13 +27,13 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8000"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${HOSTNAME}`${EXTRA_DOMAINS})"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        ## Redirect from EXTRA_DOMAINS to HOSTNAME
+        ## Redirect from EXTRA_DOMAINS to DOMAIN
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${HOSTNAME}"
+        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
@@ -52,7 +52,9 @@ services:
       - POSTGRES_DB=bonfire_db
     networks:
       - internal
-
+    secrets: 
+          - POSTGRES_PASSWORD
+       
   bonfire_search:
     image: getmeili/meilisearch:latest
     volumes: