refactor: use $DOMAIN env var instead of hardcoded lazyworkhorse.net

Replace all hardcoded lazyworkhorse.net references in compose files with ${DOMAIN} variable substitution. Create .env.production and .env.staging environment files. Update Makefile with ENV selection (--env-file support) and staging/production targets. Changes: - All 13 compose YAML files: lazyworkhorse.net -> ${DOMAIN} - New .env.production (DOMAIN=lazyworkhorse.net) - New .env.staging (DOMAIN=staging.lazyworkhorse.net) - Makefile: ENV var, --env-file flag, staging/production targets - Gitea redirect regex updated for variable substitution - CI workflow checkout URLs left hardcoded (infrastructure refs) - Dockerfile SSH host refs left hardcoded (infrastructure refs) Deploy: make ENV=staging all_up or make staging make ENV=production all_up or make production
2026-05-20 14:20:44 -04:00
21 changed files with 268 additions and 369 deletions
--- a/.env.production
+++ b/.env.production
@@ -0,0 +1,4 @@
+# Production environment
+# docker compose --env-file .env.production up -d
+DOMAIN=lazyworkhorse.net
+SITE_URL=https://lazyworkhorse.net
--- a/.env.staging
+++ b/.env.staging
@@ -0,0 +1,4 @@
+# Staging environment
+# docker compose --env-file .env.staging up -d
+DOMAIN=staging.lazyworkhorse.net
+SITE_URL=https://staging.lazyworkhorse.net
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +0,0 @@
-# Temp/scratch files — never commit these
-*.bak
-*.swp
-*.tmp
-*~
-scratch/
-.env
-.env.local
-tmp/
-temp/
-replace_compose.py
-entrypoint-*.sh
-copy_*.txt
--- a/33
+++ b/33
@@ -1,13 +1,18 @@
 # Base path for docker-compose files
-COMPOSE_PATH=~/Projects/AltNet/docker-compose
+COMPOSE_PATH?=~/Projects/AltNet/docker-compose
+
+# Environment selection: staging or production (default)
+ENV?=production
+ENV_FILE=.env.$(ENV)

 # List of services (folder names)
 SERVICES=monitoring ai cloudstorage crm_tp crm_cf mediacenter homeautomation network backup homepage passwordmanager

 # Bring up all services
 all_up:
+	@echo "Deploying with $(ENV) environment ($(ENV_FILE))..."
 	@for service in $(SERVICES); do \
-		docker compose -f $(COMPOSE_PATH)/$$service/compose.yml up -d; \
+		docker compose --env-file $(ENV_FILE) -f $(COMPOSE_PATH)/$$service/compose.yml up -d; \
 	done

 # Bring down all services
@@ -18,15 +23,27 @@ all_down:

 # Generic target to deploy a specific service
 %_up:
-	@docker compose -f $(COMPOSE_PATH)/$*/compose.yml up -d
+	@echo "Deploying $* with $(ENV) environment ($(ENV_FILE))..."
+	@docker compose --env-file $(ENV_FILE) -f $(COMPOSE_PATH)/$*/compose.yml up -d

 # Generic target to bring down a specific service
 %_down:
 	@docker compose -f $(COMPOSE_PATH)/$*/compose.yml down

+# Deploy staging (all services)
+staging:
+	@$(MAKE) all_up ENV=staging
+
+# Deploy production (all services)
+production:
+	@$(MAKE) all_up ENV=production
+
+# Staging per-service: make openwebui_up ENV=staging
+# Production per-service: make openwebui_up ENV=production
+
 all_stack_up:
 	@for service in $(SERVICES); do \
-		docker stack deploy -c $(COMPOSE_PATH)/$$service/compose.yml $$service; \
+		docker stack deploy --env-file $(ENV_FILE) -c $(COMPOSE_PATH)/$$service/compose.yml $$service; \
 	done

 all_stack_down:
@@ -35,7 +52,7 @@ all_stack_down:
 	done

 %_stack_up:
-	@docker stack deploy -c $(COMPOSE_PATH)/$*/compose.yml $*
+	@docker stack deploy --env-file $(ENV_FILE) -c $(COMPOSE_PATH)/$*/compose.yml $*

 %_stack_down:
 	@docker stack rm $*
@@ -43,3 +60,9 @@ all_stack_down:
 stack_ls:
 	@docker node ps workGoat;
 	docker node ps workHorse
+
+# Show current environment settings
+env:
+	@echo "Active environment: $(ENV)"
+	@echo "Env file: $(ENV_FILE)"
+	@test -f $(ENV_FILE) && cat $(ENV_FILE) || echo "WARNING: $(ENV_FILE) not found!"
--- a/ai/compose.yml
+++ b/ai/compose.yml
@@ -15,12 +15,12 @@ services:
  #     - "traefik.enable=true"

  #     # Router for HTTP + redirection to HTTPS
-  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-http.rule=Host(`ai.${DOMAIN}`)"
  #     - "traefik.http.routers.webui-http.entrypoints=web"
  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"

  #     # Router for HTTPS with TLS
-  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-https.rule=Host(`ai.${DOMAIN}`)"
  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
  #     - "traefik.http.routers.webui-https.tls=true"
  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
@@ -32,18 +32,13 @@ services:
        - default
    container_name: hermes
    entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
+      "bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
      "hermes-entrypoint"]
    restart: always
    # Gateway run enables the internal API server on port 8642
    command: gateway run
    environment:
      - OLLAMA_HOST=http://ollama:11434
-      - HERMES_DASHBOARD=1
-      # Multi-profile: comma-separated list of profiles to run as gateways.
-      # The entrypoint reads this and starts one gateway per profile.
-      # Add profiles here when they exist on disk (e.g. default,researcher,writer)
-      - HERMES_PROFILES=ashley,claire,finn,matt,paul
      - API_SERVER_ENABLED=true
      - API_SERVER_PORT=8642
      - API_SERVER_HOST=0.0.0.0
@@ -71,30 +66,6 @@ services:
      - "26"
    networks:
      - ai_backend
-      - ai_net
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=ai_net"
-
-      # Router for HTTP + redirection to HTTPS
-      - "traefik.http.routers.hermes-web-http.rule=Host(`hermes.lazyworkhorse.net`)"
-      - "traefik.http.routers.hermes-web-http.entrypoints=web"
-      - "traefik.http.routers.hermes-web-http.middlewares=redirect-to-https"
-
-      # Router for HTTPS with TLS — protected by Authelia
-      - "traefik.http.routers.hermes-web-https.rule=Host(`hermes.lazyworkhorse.net`)"
-      - "traefik.http.routers.hermes-web-https.entrypoints=websecure"
-      - "traefik.http.routers.hermes-web-https.tls=true"
-      - "traefik.http.routers.hermes-web-https.tls.certresolver=njalla"
-      - "traefik.http.routers.hermes-web-https.middlewares=hermes-auth"
-
-      # Authelia forwardAuth
-      - "traefik.http.middlewares.hermes-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
-      - "traefik.http.middlewares.hermes-auth.forwardauth.trustforwardheader=true"
-      - "traefik.http.middlewares.hermes-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
-
-      # Service Loadbalancer (dashboard port 9119)
-      - "traefik.http.services.hermes-web.loadbalancer.server.port=9119"

  syncthing:
    image: syncthing/syncthing:latest
@@ -116,10 +87,10 @@ services:
      - ai_net
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
+      - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.${DOMAIN}`)"
      - "traefik.http.routers.syncthing-http.entrypoints=web"
      - "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
-      - "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
+      - "traefik.http.routers.syncthing-https.rule=Host(`syncthing.${DOMAIN}`)"
      - "traefik.http.routers.syncthing-https.entrypoints=websecure"
      - "traefik.http.routers.syncthing-https.tls=true"
      - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
@@ -261,12 +232,12 @@ networks:
  #   networks:
  #     - ai_net
  #   environment:
-  #     - N8N_HOST=n8n.lazyworkhorse.net
+  #     - N8N_HOST=n8n.${DOMAIN}
  #     - N8N_PORT=5678
  #     - N8N_PROTOCOL=https
  #     - NODE_ENV=production
  #     - N8N_ENCRYPTION_KEY=${N8N_ENCRYPTION_KEY}
-  #     - WEBHOOK_URL=https://n8n.lazyworkhorse.net/
+  #     - WEBHOOK_URL=https://n8n.${DOMAIN}/
  #     - GENERIC_TIMEZONE=America/New_York # Adjust to your timezone
  #     - N8N_BLOCK_EXTERNAL_STORAGE_ACCESS=false
  #     - N8N_NODES_PYTHON_CAN_IMPORT_MODULES=true 
@@ -280,12 +251,12 @@ networks:
  #     - "traefik.enable=true"

  #     # Router for HTTP + redirection to HTTPS
-  #     - "traefik.http.routers.n8n-http.rule=Host(`n8n.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.n8n-http.rule=Host(`n8n.${DOMAIN}`)"
  #     - "traefik.http.routers.n8n-http.entrypoints=web"
  #     - "traefik.http.routers.n8n-http.middlewares=redirect-to-https"

  #     # Router for HTTPS with TLS
-  #     - "traefik.http.routers.n8n-https.rule=Host(`n8n.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.n8n-https.rule=Host(`n8n.${DOMAIN}`)"
  #     - "traefik.http.routers.n8n-https.entrypoints=websecure"
  #     - "traefik.http.routers.n8n-https.tls=true"
  #     - "traefik.http.routers.n8n-https.tls.certresolver=njalla"
@@ -315,15 +286,15 @@ networks:
  #     - BROWSER_CDP_URL=http://openclaw-browser:9222
  #     - BROWSER_EVALUATE_ENABLED=true
  #     - OPENCLAW_GATEWAY_HOST=0.0.0.0
-  #     - OPENCLAW_ALLOWED_ORIGINS=https://claw.lazyworkhorse.net
+  #     - OPENCLAW_ALLOWED_ORIGINS=https://claw.${DOMAIN}
  #   labels:
  #     - "traefik.enable=true"

-  #     - "traefik.http.routers.openclaw-http.rule=Host(`claw.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.openclaw-http.rule=Host(`claw.${DOMAIN}`)"
  #     - "traefik.http.routers.openclaw-http.entrypoints=web"
  #     - "traefik.http.routers.openclaw-http.middlewares=redirect-to-https"

-  #     - "traefik.http.routers.openclaw-https.rule=Host(`claw.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.openclaw-https.rule=Host(`claw.${DOMAIN}`)"
  #     - "traefik.http.routers.openclaw-https.priority=50"
  #     - "traefik.http.routers.openclaw-https.entrypoints=websecure"
  #     - "traefik.http.routers.openclaw-https.tls=true"
--- a/ai/hermes/Dockerfile
+++ b/ai/hermes/Dockerfile
@@ -20,10 +20,16 @@ RUN --mount=type=ssh \
    GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
    git clone --depth 1 --branch main \
    git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
-    rm -rf fork/node_modules fork/.venv fork/.git && \
-    cp -a fork/. /opt/hermes/ && \
+    rsync -a --delete fork/ /opt/hermes/ \
+      --exclude node_modules \
+      --exclude .venv \
+      --exclude .git && \
    rm -rf /tmp/fork /root/.ssh/

+# ---------- Rebuild web UI ----------
+# Source files changed; node_modules (from base image) reused.
+RUN cd /opt/hermes && npm run build
+
 # ---------- Reinstall Python package (editable) ----------
 # Picks up source changes from our fork.
 RUN . /opt/hermes/.venv/bin/activate && \
@@ -34,7 +40,6 @@ USER root
 RUN apt-get update && \
    apt-get install -y --no-install-recommends \
        libportaudio2 ca-certificates poppler-utils imagemagick \
-        libolm-dev \
        texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
        texlive-xetex texlive-science \
        qemu-user-static binfmt-support emacs-nox && \
@@ -43,12 +48,6 @@ RUN apt-get update && \
 # ---------- UV ----------
 COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/

-# ---------- Matrix bridge + extra pip deps ----------
-# Previously installed inline at container startup and persisted via volume mount.
-# Now baked into the image so the fragile venv volume mount can be removed.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir 'mautrix[encryption]' openai
-
 # ---------- Piper TTS ----------
 RUN . /opt/hermes/.venv/bin/activate && \
    uv pip install --no-cache-dir piper-tts sounddevice numpy && \
@@ -76,9 +75,9 @@ os.remove(tgz)
 print('himalaya v1.2.0 installed')
 PYEOF

-# ---------- Install multi-gateway launcher ----------
-# Launches one gateway process per profile (HERMES_PROFILES env var)
-COPY --chmod=0755 run-multi-gateways.sh /usr/local/bin/run-multi-gateways.sh
+# ---------- Install himalaya-ro wrapper ----------
+COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
+

 # ---------- Runtime ----------
 USER hermes
@@ -89,7 +88,6 @@ ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome

 # Ensure tools directory and toolsets.py are writable by the hermes runtime user
 # so custom tools can be injected from the persistent volume at startup.
-USER root
 RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py

 VOLUME [ "/opt/data" ]
--- a/ai/hermes/himalaya-ro.sh
+++ b/ai/hermes/himalaya-ro.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# ─────────────────────────────────────────────────────────────
+# himalaya-ro — Read-only wrapper for himalaya
+#
+# Blocks destructive commands and logs audit trail.
+# Pass-through for read-only commands (list, read, search).
+#
+# Usage:  himalaya-ro [options] <command> [args...]
+#
+# Install: place in PATH before the real himalaya, or use
+#          `ln -sf himalaya-ro /usr/local/bin/himalaya`
+# ─────────────────────────────────────────────────────────────
+set -o pipefail
+
+# ── Configuration ───────────────────────────────────────────
+HIMALAYA_BIN="${HIMALAYA_BIN:-/usr/local/bin/himalaya}"
+AUDIT_LOG="${HIMALAYA_AUDIT_LOG:-/var/log/himalaya-audit.log}"
+
+# ── Destructive commands we block ──────────────────────────
+BLOCKED_CMDS=(
+  "message move"
+  "message delete"
+  "message copy"
+  "flag add"
+  "flag remove"
+  "folder create"
+  "folder delete"
+  "folder rename"
+  "template send"
+  "account configure"
+  "account delete"
+)
+
+# ── Determine the subcommand being invoked ─────────────────
+# Strip leading options (--account, --output, etc.) to find the verb
+ARGS=()
+SKIP_NEXT=false
+for arg in "$@"; do
+  if $SKIP_NEXT; then
+    SKIP_NEXT=false
+    continue
+  fi
+  if [[ "$arg" == --* ]]; then
+    case "$arg" in
+      --account|--output|--page|--page-size|--folder|--color|--format)
+        SKIP_NEXT=true ;;
+    esac
+    continue
+  fi
+  ARGS+=("$arg")
+done
+
+# Build subcommand string and check against blocklist
+CMD_STR=""
+for ((i=0; i<${#ARGS[@]}; i++)); do
+  if [ -z "$CMD_STR" ]; then
+    CMD_STR="${ARGS[$i]}"
+  else
+    CMD_STR="$CMD_STR ${ARGS[$i]}"
+  fi
+  for blocked in "${BLOCKED_CMDS[@]}"; do
+    if [[ "$CMD_STR" == "$blocked" ]]; then
+      TS=$(date '+%Y-%m-%d %H:%M:%S')
+      echo "[AUDIT] $TS BLOCKED: himalaya $*" >> "$AUDIT_LOG"
+      echo "ERROR: Command 'himalaya $CMD_STR ...' is blocked by read-only policy." >&2
+      echo "       Audit log: $AUDIT_LOG" >&2
+      exit 100
+    fi
+  done
+done
+
+# ── Allow pass-through ─────────────────────────────────────
+exec "$HIMALAYA_BIN" "$@"
--- a/ai/hermes/run-multi-gateways.sh
+++ b/ai/hermes/run-multi-gateways.sh
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Multi-gateway launcher for HERMES_PROFILES env var.
-# Reads comma-separated profile names, spawns one gateway per profile.
-# Designed to run before the main entrypoint — gateways run in background.
-set -e
-
-if [ -z "${HERMES_PROFILES}" ]; then
-  echo "HERMES_PROFILES not set — skipping multi-gateway launch"
-  exit 0
-fi
-
-# Source venv to make 'hermes' available (entrypoint.sh sources it later,
-# but we need it NOW for the background gateways)
-HERMES_BIN="/opt/hermes/.venv/bin/hermes"
-if [ ! -x "$HERMES_BIN" ]; then
-  echo "ERROR: hermes binary not found at $HERMES_BIN"
-  exit 1
-fi
-
-mkdir -p /opt/data/logs
-
-IFS=',' read -ra PROFILES <<< "${HERMES_PROFILES}"
-for profile in "${PROFILES[@]}"; do
-  profile="$(echo "${profile}" | xargs)"  # trim whitespace
-  [ -z "${profile}" ] && continue
-
-  echo "Starting gateway for profile: ${profile}"
-  nohup env API_SERVER_ENABLED=false API_SERVER_KEY= gosu hermes "$HERMES_BIN" --profile "${profile}" gateway run \
-      >> "/opt/data/logs/gateway-${profile}.log" 2>&1 &
-done
-
-echo "All gateways launched: ${HERMES_PROFILES}"
--- a/authentification/compose.yml
+++ b/authentification/compose.yml
@@ -13,12 +13,12 @@ services:
      - "traefik.enable=true"

      # HTTP router
-      - "traefik.http.routers.authelia-http.rule=Host(`auth.lazyworkhorse.net`)"
+      - "traefik.http.routers.authelia-http.rule=Host(`auth.${DOMAIN}`)"
      - "traefik.http.routers.authelia-http.entrypoints=web"
      - "traefik.http.routers.authelia-http.middlewares=redirect-to-https"

      # HTTPS router
-      - "traefik.http.routers.authelia-https.rule=Host(`auth.lazyworkhorse.net`)"
+      - "traefik.http.routers.authelia-https.rule=Host(`auth.${DOMAIN}`)"
      - "traefik.http.routers.authelia-https.entrypoints=websecure"
      - "traefik.http.routers.authelia-https.tls=true"
      - "traefik.http.routers.authelia-https.tls.certresolver=njalla"
@@ -26,7 +26,7 @@ services:
      - "traefik.http.services.authelia.loadbalancer.server.port=9091"

      # forward auth middleware definition
-      - "traefik.http.middlewares.authelia.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net"
+      - "traefik.http.middlewares.authelia.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.${DOMAIN}"
      - "traefik.http.middlewares.authelia.forwardauth.trustForwardHeader=true"
      - "traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=Remote-User,Remote-Groups,Remote-Name,Remote-Email"

--- a/backup/compose.yml
+++ b/backup/compose.yml
@@ -37,12 +37,12 @@ services:
  #   labels:
  #     - "traefik.enable=true"
  #     # 1. HTTP to HTTPS Redirect
-  #     - "traefik.http.routers.kopia-http.rule=Host(`backup.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.kopia-http.rule=Host(`backup.${DOMAIN}`)"
  #     - "traefik.http.routers.kopia-http.entrypoints=web"
  #     - "traefik.http.routers.kopia-http.middlewares=redirect-to-https@docker"
  #     
  #     # 2. HTTPS Configuration
-  #     - "traefik.http.routers.kopia.rule=Host(`backup.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.kopia.rule=Host(`backup.${DOMAIN}`)"
  #     - "traefik.http.routers.kopia.entrypoints=websecure"
  #     - "traefik.http.routers.kopia.tls=true"
  #     - "traefik.http.routers.kopia.tls.certresolver=njalla"
@@ -81,12 +81,12 @@ services:
    labels:
      - "traefik.enable=true"
      # 1. HTTP to HTTPS Redirect
-      - "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
+      - "traefik.http.routers.restic-browser-http.rule=Host(`backup.${DOMAIN}`)"
      - "traefik.http.routers.restic-browser-http.entrypoints=web"
      - "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
      
      # 2. HTTPS Configuration
-      - "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
+      - "traefik.http.routers.restic-browser.rule=Host(`backup.${DOMAIN}`)"
      - "traefik.http.routers.restic-browser.entrypoints=websecure"
      - "traefik.http.routers.restic-browser.tls=true"
      - "traefik.http.routers.restic-browser.tls.certresolver=njalla"
--- a/cloudstorage/compose.yml
+++ b/cloudstorage/compose.yml
@@ -17,8 +17,8 @@ services:
      - MYSQL_PASSWORD=${NEXTCLOUD_MYSQL_PASSWORD}
      # Reverse Proxy Overrides (Crucial for HTTPS behind Traefik)
      - OVERWRITEPROTOCOL=https
-      - OVERWRITECLIURL=https://cloud.lazyworkhorse.net
-      - NEXTCLOUD_TRUSTED_DOMAINS=cloud.lazyworkhorse.net
+      - OVERWRITECLIURL=https://cloud.${DOMAIN}
+      - NEXTCLOUD_TRUSTED_DOMAINS=cloud.${DOMAIN}
    volumes:
      - /mnt/HoardingCow_docker_data/NextCloud/data:/var/www/html:rw
    depends_on:
@@ -27,12 +27,12 @@ services:
      - "traefik.enable=true"

      # Router for HTTP -> HTTPS Redirection (Matching your Gitea style)
-      - "traefik.http.routers.nextcloud-http.rule=Host(`cloud.lazyworkhorse.net`)"
+      - "traefik.http.routers.nextcloud-http.rule=Host(`cloud.${DOMAIN}`)"
      - "traefik.http.routers.nextcloud-http.entrypoints=web"
      - "traefik.http.routers.nextcloud-http.middlewares=redirect-to-https"

      # Router for HTTPS
-      - "traefik.http.routers.nextcloud-https.rule=Host(`cloud.lazyworkhorse.net`)"
+      - "traefik.http.routers.nextcloud-https.rule=Host(`cloud.${DOMAIN}`)"
      - "traefik.http.routers.nextcloud-https.entrypoints=websecure"
      - "traefik.http.routers.nextcloud-https.tls=true"
      - "traefik.http.routers.nextcloud-https.tls.certresolver=njalla"
--- a/coms/compose.yml
+++ b/coms/compose.yml
@@ -25,10 +25,10 @@ services:
        condition: service_healthy
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.matrix-http.rule=Host(`matrix.lazyworkhorse.net`)"
+      - "traefik.http.routers.matrix-http.rule=Host(`matrix.${DOMAIN}`)"
      - "traefik.http.routers.matrix-http.entrypoints=web"
      - "traefik.http.routers.matrix-http.middlewares=redirect-to-https"
-      - "traefik.http.routers.matrix-https.rule=Host(`matrix.lazyworkhorse.net`)"
+      - "traefik.http.routers.matrix-https.rule=Host(`matrix.${DOMAIN}`)"
      - "traefik.http.routers.matrix-https.entrypoints=websecure"
      - "traefik.http.routers.matrix-https.tls=true"
      - "traefik.http.routers.matrix-https.tls.certresolver=njalla"
@@ -62,10 +62,10 @@ services:
      - coms_net
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.synapse-admin-http.rule=Host(`synadm.lazyworkhorse.net`)"
+      - "traefik.http.routers.synapse-admin-http.rule=Host(`synadm.${DOMAIN}`)"
      - "traefik.http.routers.synapse-admin-http.entrypoints=web"
      - "traefik.http.routers.synapse-admin-http.middlewares=redirect-to-https"
-      - "traefik.http.routers.synapse-admin-https.rule=Host(`synadm.lazyworkhorse.net`)"
+      - "traefik.http.routers.synapse-admin-https.rule=Host(`synadm.${DOMAIN}`)"
      - "traefik.http.routers.synapse-admin-https.entrypoints=websecure"
      - "traefik.http.routers.synapse-admin-https.tls=true"
      - "traefik.http.routers.synapse-admin-https.tls.certresolver=njalla"
@@ -88,12 +88,12 @@ services:
  #     - "traefik.enable=true"
  #
  #     # HTTP → HTTPS
-  #     - "traefik.http.routers.rns-http.rule=Host(`nomad.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.rns-http.rule=Host(`nomad.${DOMAIN}`)"
  #     - "traefik.http.routers.rns-http.entrypoints=web"
  #     - "traefik.http.routers.rns-http.middlewares=redirect-to-https"
  #
  #     # HTTPS protected by Authelia
-  #     - "traefik.http.routers.rns-https.rule=Host(`nomad.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.rns-https.rule=Host(`nomad.${DOMAIN}`)"
  #     - "traefik.http.routers.rns-https.entrypoints=websecure"
  #     - "traefik.http.routers.rns-https.tls=true"
  #     - "traefik.http.routers.rns-https.tls.certresolver=njalla"
--- a/finance/compose.yml
+++ b/finance/compose.yml
@@ -15,20 +15,20 @@ services:
      - "traefik.enable=true"

      # HTTP → HTTPS redirect
-      - "traefik.http.routers.fava-http.rule=Host(`money.lazyworkhorse.net`)"
+      - "traefik.http.routers.fava-http.rule=Host(`money.${DOMAIN}`)"
      - "traefik.http.routers.fava-http.entrypoints=web"
      - "traefik.http.routers.fava-http.middlewares=redirect-to-https"
      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"

      # HTTPS router protected by Authelia
-      - "traefik.http.routers.fava-https.rule=Host(`money.lazyworkhorse.net`)"
+      - "traefik.http.routers.fava-https.rule=Host(`money.${DOMAIN}`)"
      - "traefik.http.routers.fava-https.entrypoints=websecure"
      - "traefik.http.routers.fava-https.tls=true"
      - "traefik.http.routers.fava-https.tls.certresolver=njalla"
      - "traefik.http.routers.fava-https.middlewares=fava-auth"

      # Authelia forwardAuth
-      - "traefik.http.middlewares.fava-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
+      - "traefik.http.middlewares.fava-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.${DOMAIN}/"
      - "traefik.http.middlewares.fava-auth.forwardauth.trustforwardheader=true"
      - "traefik.http.middlewares.fava-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"

--- a/homeautomation/compose.yml
+++ b/homeautomation/compose.yml
@@ -17,11 +17,11 @@ services:
    labels:
      - "traefik.enable=true"

-      - "traefik.http.routers.hass-http.rule=Host(`home.lazyworkhorse.net`)"
+      - "traefik.http.routers.hass-http.rule=Host(`home.${DOMAIN}`)"
      - "traefik.http.routers.hass-http.entrypoints=web"
      - "traefik.http.routers.hass-http.middlewares=redirect-to-https"

-      - "traefik.http.routers.hass-https.rule=Host(`home.lazyworkhorse.net`)"
+      - "traefik.http.routers.hass-https.rule=Host(`home.${DOMAIN}`)"
      - "traefik.http.routers.hass-https.entrypoints=websecure"
      - "traefik.http.routers.hass-https.tls.certresolver=njalla"

--- a/homepage/compose.yml
+++ b/homepage/compose.yml
@@ -16,20 +16,20 @@ services:
      - "traefik.enable=true"

      # HTTP → HTTPS redirect
-      - "traefik.http.routers.homer-http.rule=Host(`lazyworkhorse.net`)"
+      - "traefik.http.routers.homer-http.rule=Host(`${DOMAIN}`)"
      - "traefik.http.routers.homer-http.entrypoints=web"
      - "traefik.http.routers.homer-http.middlewares=redirect-to-https"
      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"

      # HTTPS router protected by Authelia
-      - "traefik.http.routers.homer-https.rule=Host(`lazyworkhorse.net`)"
+      - "traefik.http.routers.homer-https.rule=Host(`${DOMAIN}`)"
      - "traefik.http.routers.homer-https.entrypoints=websecure"
      - "traefik.http.routers.homer-https.tls=true"
      - "traefik.http.routers.homer-https.tls.certresolver=njalla"
      - "traefik.http.routers.homer-https.middlewares=homer-auth"

      # Authelia forwardAuth
-      - "traefik.http.middlewares.homer-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
+      - "traefik.http.middlewares.homer-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.${DOMAIN}/"
      - "traefik.http.middlewares.homer-auth.forwardauth.trustforwardheader=true"
      - "traefik.http.middlewares.homer-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"

--- a/int/.env.example
+++ b/int/.env.example
@@ -1,53 +0,0 @@
-# =============================================================================
-# WorldMonitor — Environment Variables
-# =============================================================================
-# Copy this file to .env (gitignored) and fill in your keys.
-# All keys are optional — the dashboard works without them,
-# but the corresponding features will be disabled.
-#
-# Usage:
-#   cp .env.example .env.local   (docker-compose auto-loads .env from CWD)
-#
-# For production secrets, add these to the shared containers.env
-# agenix secret at: secrets/containers.env.age
-# =============================================================================
-
-# ── REQUIRED: These containers refuse to start without them ──
-# Generate with: openssl rand -hex 32
-REDIS_PASSWORD=
-REDIS_TOKEN=
-RELAY_SHARED_SECRET=
-
-# ── LLM / AI (for intelligence assessments) ──
-# Pick one or both
-GROQ_API_KEY=               # https://console.groq.com (free: 14,400 req/day)
-OPENROUTER_API_KEY=         # https://openrouter.ai (free: 50 req/day)
-
-# ── Markets & Economics (optional) ──
-FINNHUB_API_KEY=            # https://finnhub.io (free tier)
-FRED_API_KEY=               # https://fred.stlouisfed.org (free)
-EIA_API_KEY=                # https://www.eia.gov/opendata/ (free)
-
-# ── Aviation (optional) ──
-AVIATIONSTACK_API=          # https://aviationstack.com (free tier)
-WINGBITS_API_KEY=           # https://wingbits.com (contact them)
-
-# ── Maritime (optional) ──
-AISSTREAM_API_KEY=          # https://aisstream.io (free tier)
-
-# ── Conflict & Unrest (optional) ──
-ACLED_ACCESS_TOKEN=         # https://acleddata.com (free for researchers)
-
-# ── Earth Observation (optional) ──
-NASA_FIRMS_API_KEY=         # https://firms.modaps.eosdis.nasa.gov (free)
-
-# ── Infrastructure / Internet (optional) ──
-CLOUDFLARE_API_TOKEN=       # https://developers.cloudflare.com/fundamentals/api/
-
-# ── Port (optional, defaults to 3000) ──
-WM_PORT=3000
-
-# ── Convex (for cloud sync / auth — optional for self-host) ──
-CONVEX_URL=
-CLERK_SECRET_KEY=
-VITE_CLERK_PUBLISHABLE_KEY=
--- a/int/compose.yml
+++ b/int/compose.yml
@@ -1,177 +0,0 @@
-# =============================================================================
-# Integrations stack
-# =============================================================================
-# Currently running: WorldMonitor
-# Planned: TAK server (commented out — needs fixing)
-# =============================================================================
-
-# ── TAK Server (FreeTAKServer) ──
-# Disabled: needs debugging. Was having connectivity/auth issues.
-# See: https://github.com/FreeTAKTeam/FreeTAKServer
-#
-# services:
-#   freetakserver:
-#     image: ghcr.io/freetakteam/freetakserver:master
-#     container_name: freetakserver
-#     hostname: freetakserver
-#     restart: always
-#     networks:
-#       - int_backend
-#     volumes:
-#       - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
-#     ports:
-#       - 8087:8087
-#       - 8089:8089
-#       - 8443:8443
-#       - 9000:9000
-#       - 19023:19023
-#     environment:
-#       FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
-#       FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
-#       FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
-#       FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
-#       FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
-#       FTS_COT_PORT: 8087
-#       FTS_SSLCOT_PORT: 8089
-#       FTS_API_PORT: 19023
-#       FTS_FED_PORT: 9000
-#       FTS_DP_ADDRESS: 'freetakserver'
-#       FTS_USER_ADDRESS: 'freetakserver'
-#       FTS_API_ADDRESS: 'freetakserver'
-#       FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
-#       FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
-#       FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
-#       FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
-#       FTS_ROUTING_PROXY_SERVER_PORT: 19031
-#       FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
-#       FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
-#       FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
-#       FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
-#       FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
-#       FTS_OPTIMIZE_API: "True"
-#       FTS_DATA_RECEPTION_BUFFER: 1024
-#       FTS_MAX_RECEPTION_TIME: 4
-#       FTS_NUM_ROUTING_WORKERS: 3
-#       FTS_COT_TO_DB: "True"
-#       FTS_MAINLOOP_DELAY: 100
-#       FTS_EMERGENCY_RADIUS: 0
-#       FTS_LOG_LEVEL: "info"
-#
-#   freetakserver-ui:
-#     image: ghcr.io/freetakteam/ui:latest
-#     container_name: freetakserver-ui
-#     hostname: freetakserver-ui
-#     restart: always
-#     networks:
-#       - int_net
-#     ports:
-#       - 5000:5000
-#     volumes:
-#       - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
-#     environment:
-#       FTS_IP: "freetakserver" 
-#       FTS_API_PORT: 19023
-#       FTS_API_PROTO: 'http'
-#       FTS_UI_EXPOSED_IP: 'freetakserver-ui'
-#       FTS_MAP_EXPOSED_IP: '127.0.0.1'
-#       FTS_MAP_PORT: 8000
-#       FTS_MAP_PROTO: 'http'
-#       FTS_UI_PORT: 5000
-#       FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
-#       FTS_API_KEY: 'Bearer token'
-#       FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
-#     labels:
-#       - "traefik.enable=true"
-#       - "traefik.docker.network=traefik-net"
-#       - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
-#       - "traefik.http.routers.fts-ui-http.entrypoints=web"
-#       - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
-#       - "traefik.http.routers.fts-ui-https.rule=Host(`tak.lazyworkhorse.net`)"
-#       - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
-#       - "traefik.http.routers.fts-ui-https.tls=true"
-#       - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
-#       - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
-#       - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
-
-# ── WorldMonitor ──
-# Real-time global intelligence dashboard
-# Repo: https://github.com/koala73/worldmonitor
-# Self-hosted, map-first OSINT with MCP support (39 tools)
-services:
-
-  worldmonitor:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: Dockerfile
-    image: worldmonitor:latest
-    container_name: worldmonitor
-    ports:
-      - "${WM_PORT:-3000}:8080"
-    environment:
-      UPSTASH_REDIS_REST_URL: "http://redis-rest:80"
-      UPSTASH_REDIS_REST_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
-      LOCAL_API_PORT: "46123"
-      LOCAL_API_MODE: "docker"
-      LOCAL_API_CLOUD_FALLBACK: "false"
-      WS_RELAY_URL: "http://ais-relay:3004"
-      # LLM providers (optional — features degrade gracefully)
-      LLM_API_URL: "${LLM_API_URL:-}"
-      LLM_API_KEY: "${LLM_API_KEY:-}"
-      LLM_MODEL: "${LLM_MODEL:-}"
-      GROQ_API_KEY: "${GROQ_API_KEY:-}"
-      # Data source API keys (optional — features degrade gracefully)
-      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
-      FINNHUB_API_KEY: "${FINNHUB_API_KEY:-}"
-      EIA_API_KEY: "${EIA_API_KEY:-}"
-      FRED_API_KEY: "${FRED_API_KEY:-}"
-      ACLED_ACCESS_TOKEN: "${ACLED_ACCESS_TOKEN:-}"
-      NASA_FIRMS_API_KEY: "${NASA_FIRMS_API_KEY:-}"
-      CLOUDFLARE_API_TOKEN: "${CLOUDFLARE_API_TOKEN:-}"
-      AVIATIONSTACK_API: "${AVIATIONSTACK_API:-}"
-    depends_on:
-      redis-rest:
-        condition: service_started
-      ais-relay:
-        condition: service_started
-    restart: unless-stopped
-
-  ais-relay:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: Dockerfile.relay
-    image: worldmonitor-ais-relay:latest
-    container_name: worldmonitor-ais-relay
-    environment:
-      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
-      PORT: "3004"
-    restart: unless-stopped
-
-  redis:
-    image: docker.io/redis:7-alpine
-    container_name: worldmonitor-redis
-    command: >
-      redis-server
-      --requirepass "${REDIS_PASSWORD:?REDIS_PASSWORD required}"
-      --maxmemory 256mb
-      --maxmemory-policy allkeys-lru
-    volumes:
-      - wm-redis-data:/data
-    restart: unless-stopped
-
-  redis-rest:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: docker/Dockerfile.redis-rest
-    image: worldmonitor-redis-rest:latest
-    container_name: worldmonitor-redis-rest
-    ports:
-      - "127.0.0.1:8079:80"
-    environment:
-      SRH_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
-      SRH_CONNECTION_STRING: "redis://:${REDIS_PASSWORD:?REDIS_PASSWORD required}@redis:6379"
-    depends_on:
-      - redis
-    restart: unless-stopped
-
-volumes:
-  wm-redis-data:
--- a/passwordmanager/compose.yml
+++ b/passwordmanager/compose.yml
@@ -9,7 +9,10 @@ services:
      - TZ=America/Montreal
      - WEBSOCKET_ENABLED=true
      - SIGNUPS_ALLOWED=false
-      - DOMAIN=https://pass.lazyworkhorse.net
+      # Vaultwarden env var DOMAIN — the ${DOMAIN} on the RHS is expanded
+      # by docker compose before the env var is set, so this resolves to
+      # DOMAIN=https://pass.lazyworkhorse.net in production.
+      - DOMAIN=https://pass.${DOMAIN}
    volumes:
      - /mnt/HoardingCow_docker_data/BitWarden/data:/data:rw
    networks:
@@ -19,12 +22,12 @@ services:
      - "traefik.enable=true"

      # HTTP → HTTPS
-      - "traefik.http.routers.pass-http.rule=Host(`pass.lazyworkhorse.net`)"
+      - "traefik.http.routers.pass-http.rule=Host(`pass.${DOMAIN}`)"
      - "traefik.http.routers.pass-http.entrypoints=web"
      - "traefik.http.routers.pass-http.middlewares=redirect-to-https"

      # HTTPS
-      - "traefik.http.routers.pass-https.rule=Host(`pass.lazyworkhorse.net`)"
+      - "traefik.http.routers.pass-https.rule=Host(`pass.${DOMAIN}`)"
      - "traefik.http.routers.pass-https.entrypoints=websecure"
      - "traefik.http.routers.pass-https.tls=true"
      - "traefik.http.routers.pass-https.tls.certresolver=njalla"
--- a/tak/compose.yml
+++ b/tak/compose.yml
@@ -0,0 +1,98 @@
+services:
+  freetakserver:
+    image: ghcr.io/freetakteam/freetakserver:master
+    container_name: freetakserver
+    hostname: freetakserver
+    restart: always
+    networks:
+      - tak_backend
+    volumes:
+      - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
+    ports:
+      - 8087:8087
+      - 8089:8089
+      - 8443:8443
+      - 9000:9000
+      - 19023:19023
+    environment:
+      FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
+      FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
+      FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
+      FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
+      FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
+      FTS_COT_PORT: 8087
+      FTS_SSLCOT_PORT: 8089
+      FTS_API_PORT: 19023
+      FTS_FED_PORT: 9000
+      FTS_DP_ADDRESS: 'freetakserver'
+      FTS_USER_ADDRESS: 'freetakserver'
+      FTS_API_ADDRESS: 'freetakserver'
+      FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
+      FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
+      FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
+      FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
+      FTS_ROUTING_PROXY_SERVER_PORT: 19031
+      FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
+      FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
+      FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
+      FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
+      FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
+      FTS_OPTIMIZE_API: "True"
+      FTS_DATA_RECEPTION_BUFFER: 1024
+      FTS_MAX_RECEPTION_TIME: 4
+      FTS_NUM_ROUTING_WORKERS: 3
+      FTS_COT_TO_DB: "True"
+      FTS_MAINLOOP_DELAY: 100
+      FTS_EMERGENCY_RADIUS: 0
+      FTS_LOG_LEVEL: "info"
+
+  freetakserver-ui:
+    image: ghcr.io/freetakteam/ui:latest
+    container_name: freetakserver-ui
+    hostname: freetakserver-ui
+    restart: always
+    networks:
+      - tak_net
+    ports:
+      - 5000:5000
+    volumes:
+      - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
+    environment:
+      FTS_IP: "freetakserver" 
+      FTS_API_PORT: 19023
+      FTS_API_PROTO: 'http'
+      FTS_UI_EXPOSED_IP: 'freetakserver-ui'
+      FTS_MAP_EXPOSED_IP: '127.0.0.1'
+      FTS_MAP_PORT: 8000
+      FTS_MAP_PROTO: 'http'
+      FTS_UI_PORT: 5000
+      FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
+      FTS_API_KEY: 'Bearer token'
+      FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=traefik-net"
+
+      # HTTP -> HTTPS Redirect
+      - "traefik.http.routers.fts-ui-http.rule=Host(`tak.${DOMAIN}`)"
+      - "traefik.http.routers.fts-ui-http.entrypoints=web"
+      - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
+
+      # HTTPS Router
+      - "traefik.http.routers.fts-ui-https.rule=Host(`tak.${DOMAIN}`)"
+      - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
+      - "traefik.http.routers.fts-ui-https.tls=true"
+      - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
+      
+      # Service & Port
+      - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
+
+      # Reuse your existing redirect middleware
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+
+networks:
+  tak_net:
+    external: true
+  tak_backend:
+    driver: bridge
+    name: tak_backend
--- a/versioncontrol/compose.yml
+++ b/versioncontrol/compose.yml
@@ -6,7 +6,7 @@ services:
    environment:
      - USER_UID=1000
      - USER_GID=1000
-      - GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
+      - GITEA__server__ROOT_URL=https://code.${DOMAIN}
      - GITEA__actions__ENABLED=true
      - SSH_PORT=2222
      - SSH_LISTEN_PORT=2222
@@ -23,21 +23,21 @@ services:
      - "traefik.enable=true"

      # HTTP -> HTTPS Redirect
-      - "traefik.http.routers.gitea-http.rule=Host(`code.lazyworkhorse.net`)"
+      - "traefik.http.routers.gitea-http.rule=Host(`code.${DOMAIN}`)"
      - "traefik.http.routers.gitea-http.entrypoints=web"
      - "traefik.http.routers.gitea-http.middlewares=redirect-to-https"
      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"

      # HTTPS Router
-      - "traefik.http.routers.gitea-https.rule=Host(`code.lazyworkhorse.net`)"
+      - "traefik.http.routers.gitea-https.rule=Host(`code.${DOMAIN}`)"
      - "traefik.http.routers.gitea-https.entrypoints=websecure"
      - "traefik.http.routers.gitea-https.tls=true"
      - "traefik.http.routers.gitea-https.tls.certresolver=njalla"
      - "traefik.http.routers.gitea-https.middlewares=gitea-home-redirect"

      # The Redirect Logic - Using single quotes to allow backslashes
-      - 'traefik.http.middlewares.gitea-home-redirect.redirectregex.regex=^https://code\.lazyworkhorse\.net/?$$'
-      - 'traefik.http.middlewares.gitea-home-redirect.redirectregex.replacement=https://code.lazyworkhorse.net/gortium'
+      - 'traefik.http.middlewares.gitea-home-redirect.redirectregex.regex=^https://code\.${DOMAIN}/?$$'
+      - 'traefik.http.middlewares.gitea-home-redirect.redirectregex.replacement=https://code.${DOMAIN}/gortium'
      - "traefik.http.middlewares.gitea-home-redirect.redirectregex.permanent=true"

      # Internal Routing
@@ -47,7 +47,7 @@ services:
    image: gitea/act_runner:latest
    container_name: act_runner
    environment:
-      - GITEA_INSTANCE_URL=https://code.lazyworkhorse.net
+      - GITEA_INSTANCE_URL=https://code.${DOMAIN}
      - GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
      - GITEA_RUNNER_NAME=ai-host-runner
      - GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix
--- a/vpn/compose.yml
+++ b/vpn/compose.yml
@@ -11,7 +11,7 @@ services:
      - NET_ADMIN
      - SYS_MODULE
    environment:
-      - WG_HOST=vpn.lazyworkhorse.net
+      - WG_HOST=vpn.${DOMAIN}
      - PASSWORD=${WG_PASSWORD}
      - WG_PORT=51820
      - WG_DEFAULT_ADDRESS=10.8.0.x