From 39f781e1d04187842c755f01c1324f7d5cb87f43 Mon Sep 17 00:00:00 2001
From: admin <alec@bryanmail.net>
Date: Thu, 25 Jun 2026 22:57:13 -0700
Subject: [PATCH] refactor(vaultwarden): parameterize domain and alt_domain in
 Traefik rule and commented URL

---
 vaultwarden.yaml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/vaultwarden.yaml b/vaultwarden.yaml
index feff5a3..cd313fd 100755
--- a/vaultwarden.yaml
+++ b/vaultwarden.yaml
@@ -29,7 +29,7 @@ services:
     environment:
       - ADMIN_TOKEN_FILE=/run/secrets/vaultwarden_admin_token
 #      - "SIGNUPS_ALLOWED=false"
-#      - "DOMAIN=https://vault.bryanmail.net"
+#      - "DOMAIN=https://vault.${DOMAIN}"
       - DATABASE_URL_FILE=/run/secrets/vaultwarden_database_url
     hostname: "Vaultwarden"
     image: "vaultwarden/server:latest"
@@ -56,7 +56,7 @@ services:
       labels:
 #        - com.centurylinklabs.watchtower=true
         - traefik.enable=true
-        - "traefik.http.routers.vaultwarden.rule=Host(`vault.bryanmail.net`) || Host(`vault.whooshh.net`)"
+        - "traefik.http.routers.vaultwarden.rule=Host(`vault.${DOMAIN}`) || Host(`vault.${ALT_DOMAIN}`)"
         - traefik.http.routers.vaultwarden.tls=true
         - traefik.http.routers.vaultwarden.tls.certresolver=letsencrypt
         - traefik.http.routers.vaultwarden.entrypoints=websecure
@@ -69,23 +69,23 @@ services:
           cpus: '4' # Limit to 0.5 CPU core
           memory: 1G
 
-#  bitwarden-to-keepass:
-#    image:  rogsme/bitwarden-to-keepass:latest
-#    command: >
-#      bash -c '$BW_PATH config server $BITWARDEN_URL && export BW_SESSION=`$BW_PATH login --raw || $BW_PATH unlock --raw`
-#      && $BW_PATH sync
-#      && python3 bitwarden-to-keepass.py
-#      && $BW_PATH lock'
-#    volumes:
-#      - /volume1/docker/Vaultwarden-to-Keepass/exports:/exports
-#      - /volume1/docker/Vaultwarden-to-Keepass/config:/root/.config/Bitwarden CLI'
-#    environment:
-#      - DATABASE_PASSWORD=cHlchLHlT1aR5eE
+# bitwarden-to-keepass:
+#  image:  rogsme/bitwarden-to-keepass:latest
+#  command: >
+#    bash -c '$BW_PATH config server $BITWARDEN_URL && export BW_SESSION=`$BW_PATH login --raw || $BW_PATH unlock --raw`
+#    && $BW_PATH sync
+#    && python3 bitwarden-to-keepass.py
+#    && $BW_PATH lock'
+#  volumes:
+#    - /volume1/docker/Vaultwarden-to-Keepass/exports:/exports
+#    - /volume1/docker/Vaultwarden-to-Keepass/config:/root/.config/Bitwarden CLI'
+#  environment:
+#    - DATABASE_PASSWORD=cHlchLHlT1aR5eE
 ##      - DATABASE_KEYFILE=
-#      - BITWARDEN_URL=https://vault.bryanmail.net
-#    deploy:
-#      labels:
-#        - traefik.enable=false
+#    - BITWARDEN_URL=https://vault.${DOMAIN}
+#  deploy:
+#    labels:
+#      - traefik.enable=false
 
 secrets:
   vaultwarden_admin_token: