From 736419320471dda13e84e5227384bcdfe49b2f17 Mon Sep 17 00:00:00 2001
From: admin <jkilloran@mapletree.email>
Date: Fri, 30 Jan 2026 09:10:41 -0700
Subject: [PATCH] variablize guacamole yml compose file

---
 lxc1/guacamole/guacamole.yml | 38 +++++++++++++-----------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/lxc1/guacamole/guacamole.yml b/lxc1/guacamole/guacamole.yml
index 0374699..e181d8e 100644
--- a/lxc1/guacamole/guacamole.yml
+++ b/lxc1/guacamole/guacamole.yml
@@ -9,8 +9,8 @@ services:
     mem_reservation: "1024m"
     restart: unless-stopped
     environment:
-      POSTGRESQL_USERNAME: guacamole_user
-      POSTGRESQL_PASSWORD: apts22$$
+      POSTGRESQL_USERNAME: ${PG_USERNAME}
+      POSTGRESQL_PASSWORD: ${PG_PASSWORD}
       POSTGRESQL_DB: guacamole_db
     volumes:
       - /docker/guacamole/init:/docker-entrypoint-initdb.d:ro # Loads schema on first boot
@@ -46,34 +46,24 @@ services:
       GUACD_HOSTNAME: guacd
       POSTGRESQL_HOSTNAME: guac-db
       POSTGRESQL_DATABASE: guacamole_db
-      POSTGRESQL_USERNAME: guacamole_user
-      POSTGRESQL_PASSWORD: apts22$$
+      POSTGRESQL_USERNAME: ${PG_USERNAME}
+      POSTGRESQL_PASSWORD: ${PG_PASSWORD}
       CATALINA_OPTS: "-Djava.security.egd=file:/dev/./urandom -Xms1g -Xmx2g"
     networks:
       - guac_internal
       - guac_external # Connects to Traefik
     labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.guac.rule=Host(`ssh.mapletree.email`)"
-      - "traefik.http.routers.guac.entrypoints=websecure"
-      - "traefik.http.routers.guac.tls=true"
-      - "traefik.http.services.guac.loadbalancer.server.port=8080"
-      - "traefik.http.routers.guac.tls.certresolver=myresolver"
-      - "traefik.docker.network=guac_external"
+      - "traefik.enable=${TRAEFIK_ENABLED:-false}"
+      # Routing Logic
+      - "traefik.http.routers.${SERVICE_NAME}.rule=Host(`${SUBDOMAIN}.${ENV_DOMAIN}`)"
+      - "traefik.http.routers.${SERVICE_NAME}.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}"
+      - "traefik.http.routers.${SERVICE_NAME}.tls=true"
+      - "traefik.http.routers.${SERVICE_NAME}.tls.certresolver=${TRAEFIK_RESOLVER:-myresolver}"
+      # Service Logic
+      - "traefik.http.services.${SERVICE_NAME}.loadbalancer.server.port=${INTERNAL_PORT:-80}"
+      # Middleware Logic
+      - "traefik.http.routers.${SERVICE_NAME}.middlewares=${MIDDLEWARES:-}"
 
-      # Middleware 1: Redirect
-      - "traefik.http.middlewares.guac-redirect.redirectregex.regex=^https://([^/]+)/?$$"
-      - "traefik.http.middlewares.guac-redirect.redirectregex.replacement=https://$${1}/guacamole/"
-
-      # Middleware 2: Disable Buffering (Stability Fix)
-      - "traefik.http.middlewares.guac-buffer.buffering.maxResponseBodyBytes=0"
-      - "traefik.http.middlewares.guac-buffer.buffering.maxRequestBodyBytes=0"
-      - "traefik.http.middlewares.guac-buffer.buffering.memRequestBodyBytes=0"
-      - "traefik.http.middlewares.guac-buffer.buffering.memResponseBodyBytes=0"
-      - "traefik.http.middlewares.guac-buffer.buffering.retryExpression=IsNetworkError() && Attempts() <= 2"
-
-      # Apply Both
-      - "traefik.http.routers.guac.middlewares=guac-redirect,guac-buffer"
 networks:
   guac_internal:
     internal: true