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
Merge pull request 'feat: add Syncthing service for Hermes org-file sync' (#30 ) from feat/syncthing-org-sync into master
2026-05-20 14:20:44 -04:00 · 2026-05-19 00:28:59 +00:00 · 2026-05-18 20:25:18 -04:00 · 2026-05-14 22:24:19 -04:00 · 2026-05-14 21:40:00 -04:00 · 2026-05-14 21:35:31 -04:00
18 changed files with 138 additions and 96 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/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"
@@ -31,6 +31,9 @@ services:
      ssh:
        - default
    container_name: hermes
+    entrypoint: ["/bin/bash", "-c",
+      "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
@@ -51,6 +54,10 @@ services:
      - TZ=America/Montreal
    volumes:
      - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
+      # Syncthing-shared org files — read-only view of user's agenda
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
+      # Syncthing-shared inbox — write tasks here, they sync to user's laptop
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
    devices:
      - /dev/kfd:/dev/kfd
      - /dev/dri:/dev/dri
@@ -60,6 +67,35 @@ services:
    networks:
      - ai_backend

+  syncthing:
+    image: syncthing/syncthing:latest
+    container_name: syncthing
+    hostname: syncthing
+    restart: always
+    ports:
+      - "8384:8384"
+      - "22000:22000"
+      - "21027:21027/udp"
+    environment:
+      - TZ=America/Montreal
+    volumes:
+      - /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
+      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
+    networks:
+      - ai_backend
+      - ai_net
+    labels:
+      - "traefik.enable=true"
+      - "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.${DOMAIN}`)"
+      - "traefik.http.routers.syncthing-https.entrypoints=websecure"
+      - "traefik.http.routers.syncthing-https.tls=true"
+      - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
+      - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
+
  ollama:
    build:
      context: ./ollama
@@ -196,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 
@@ -215,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"
@@ -250,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
@@ -86,7 +86,8 @@ ENV PATH="/opt/data/.local/bin:${PATH}"
 # Point browser tool to Playwright's Chromium (already in base image)
 ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome

-VOLUME [ "/opt/data" ]
+# 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.
+RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py

-COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
-ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]
+VOLUME [ "/opt/data" ]
--- a/ai/hermes/fix-permissions.sh
+++ b/ai/hermes/fix-permissions.sh
@@ -1,38 +0,0 @@
-#!/bin/bash
-# Startup permission fix + TTS patch.
-# Runs as root before the entrypoint drops to the hermes user.
-set -e
-
-HERMES_HOME="${HERMES_HOME:-/opt/data}"
-
-# Fix ownership on critical writable directories
-chown -R hermes:hermes \
-  "$HERMES_HOME/sessions" \
-  "$HERMES_HOME/checkpoints" \
-  "$HERMES_HOME/skills" \
-  "$HERMES_HOME/memories" \
-  "$HERMES_HOME/workspace" \
-  "$HERMES_HOME/pastes" \
-  "$HERMES_HOME/logs" \
-  "$HERMES_HOME/cron" \
-  "$HERMES_HOME/plans" \
-  "$HERMES_HOME/hooks" \
-  "$HERMES_HOME/cache" \
-  2>/dev/null || true
-
-# Fix data volume root ownership
-if [ "$(stat -c %u "$HERMES_HOME" 2>/dev/null)" != "$(id -u hermes)" ]; then
-  chown hermes:hermes "$HERMES_HOME" 2>/dev/null || true
-fi
-
-# ---------- Patch tts_tool.py: replace Edge TTS with Piper ----------
-# Fallback runtime patch in case the volume's site-packages differ from the image.
-# Idempotent: if already patched, the script does nothing.
-PATCH_SCRIPT="/opt/hermes/patch_tts_tool.py"
-if [ -f "$PATCH_SCRIPT" ]; then
-  echo "Applying TTS patch (Piper only, no Edge fallback)..."
-  /opt/hermes/.venv/bin/python3 "$PATCH_SCRIPT" 2>&1 || true
-fi
-
-# Chain to the official Hermes entrypoint
-exec /opt/hermes/docker/entrypoint.sh "$@"
--- 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/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
@@ -74,12 +74,12 @@ services:
      - "traefik.docker.network=traefik-net"

      # HTTP -> HTTPS Redirect
-      - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
+      - "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.lazyworkhorse.net`)"
+      - "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"
--- a/versioncontrol/compose.yml
+++ b/versioncontrol/compose.yml
@@ -6,15 +6,12 @@ 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
-      - GITEA__actions__DEFAULT_ACTIONS_URL=off
      - SSH_PORT=2222
      - SSH_LISTEN_PORT=2222
      # Enable Gitea Actions (act_runner required on host)
      - GITEA__actions__ENABLED=true
-      # Don't fetch actions from GitHub (offline mode + local only)
-      - GITEA__actions__DEFAULT_ACTIONS_URL=off
    volumes:
      - /mnt/HoardingCow_docker_data/Gitea:/data
    networks:
@@ -26,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
@@ -50,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/Dockerfile
+++ b/vpn/Dockerfile
@@ -0,0 +1,9 @@
+# Custom wg-easy with iptables-nft (nftables-backed iptables)
+# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
+FROM ghcr.io/wg-easy/wg-easy:latest
+
+# The upstream image registers only iptables-legacy with update-alternatives.
+# iptables-nft binary exists but isn't registered as an alternative key.
+# Override the alternatives-managed symlinks directly.
+RUN ln -sf /usr/sbin/iptables-nft /usr/sbin/iptables && \
+    ln -sf /usr/sbin/ip6tables-nft /usr/sbin/ip6tables
--- a/vpn/compose.yml
+++ b/vpn/compose.yml
@@ -2,13 +2,16 @@ version: "3.8"

 services:
  wireguard:
-    image: weejewel/wg-easy:latest
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: wg-easy-iptables-nft:latest
    container_name: wireguard
    cap_add:
      - 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
Author	SHA1	Message	Date
Hermes	5a4963c2bd	refactor: use $DOMAIN env var instead of hardcoded lazyworkhorse.net Some checks failed Build Hermes agent / build (pull_request) Has been cancelled Details Build ollama (gfx906) / build (pull_request) Has been cancelled Details 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
Thierry Pouplier	d3f2e3b7b9	Merge pull request 'feat: add Syncthing service for Hermes org-file sync' (#30 ) from feat/syncthing-org-sync into master Some checks failed Build Hermes agent / build (push) Has been cancelled Details Build ollama (gfx906) / build (push) Has been cancelled Details Reviewed-on: #30	2026-05-19 00:28:59 +00:00
Thierry Pouplier	6a44120b1a	Fixed syncthing dir path Some checks failed Build Hermes agent / build (pull_request) Has been cancelled Details Build ollama (gfx906) / build (pull_request) Has been cancelled Details	2026-05-18 20:25:18 -04:00
Thierry Pouplier	38a1451689	Merge branch 'master' into feat/syncthing-org-sync	2026-05-14 22:24:19 -04:00
Hermes	f9fb28d560	fix: route Syncthing web UI through Traefik with HTTPS Some checks failed Build Hermes agent / build (pull_request) Has been cancelled Details Build ollama (gfx906) / build (pull_request) Has been cancelled Details	2026-05-14 21:40:00 -04:00
Hermes	bcc4b6d157	feat: add Syncthing service for Hermes org-file sync Some checks failed Build Hermes agent / build (pull_request) Has been cancelled Details Build ollama (gfx906) / build (pull_request) Has been cancelled Details	2026-05-14 21:35:31 -04:00
Thierry Pouplier	8d1ae7e632	Remove the unsuported gitea action off	2026-05-13 13:11:11 -04:00
Thierry Pouplier	29ae32a1c5	Merge pull request 'fix: use ln -sf instead of update-alternatives --set for iptables-nft' (#28 ) from fix/vpn-iptables-nft-v3 into master Reviewed-on: #28	2026-05-13 16:59:50 +00:00
Hermes	8dff094768	fix: use ln -sf instead of update-alternatives --set update-alternatives --set fails because the base image only registers iptables-legacy as an alternative. The iptables-nft binary (/usr/sbin/iptables-nft) exists but isn't in the alternatives database. Direct ln -sf bypasses this.	2026-05-13 12:58:43 -04:00
Thierry Pouplier	ec08f5eb5d	Merge pull request 'fix: remove apk add iptables-nft — built-in on Alpine 3.18+' (#27 ) from fix/vpn-iptables-nft-v2 into master Reviewed-on: #27	2026-05-13 16:49:23 +00:00
Hermes	611e96b306	fix: remove apk add iptables-nft — built-in on Alpine 3.18+ In Alpine 3.18+, the 'iptables' package IS the nftables variant. iptables-nft is not a separate package. The binary is already in the base image — only need to flip update-alternatives.	2026-05-13 12:48:51 -04:00
Thierry Pouplier	f184ed957c	Merge pull request 'fix: update wg-easy to official ghcr image with iptables-nft' (#26 ) from fix/vpn-iptables-nft-upstream into master Reviewed-on: #26	2026-05-13 16:37:35 +00:00
Hermes	2bf31c7ccc	fix: update wg-easy to official ghcr image with iptables-nft - Switch FROM weejewel/wg-easy:latest (4yr old, Alpine 3.11) to ghcr.io/wg-easy/wg-easy:latest (actively maintained, Alpine krypton) - Use update-alternatives instead of raw ln -sf to flip iptables from legacy to nftables backend - Fix compose build context: ./vpn -> . (Dockerfile was at same level) The weejewel/wg-easy image lacked iptables-nft package in Alpine 3.11. The new official image has it available, we just flip the alternatives. The old ln -sf approach was fragile across Alpine versions.	2026-05-13 12:30:15 -04:00
Thierry Pouplier	f44f93e35a	Merge pull request 'fix: add Himalaya email CLI to Hermes Docker image' (#25 ) from fix/himalaya-email-cli into master Some checks failed Build Hermes agent / build (push) Has been cancelled Details Reviewed-on: #25	2026-05-13 15:03:40 +00:00
Thierry Pouplier	4cdd157e3f	Merge pull request 'fix: add iptables-nft to wg-easy for nftables-only kernels' (#24 ) from fix/wg-easy-iptables-nft into master Reviewed-on: #24	2026-05-13 15:03:25 +00:00
Thierry Pouplier	3ba0345887	Merge pull request 'feat: install custom Hermes tools at startup, remove deprecated fix-permissions.sh' (#23 ) from feat/hermes-custom-tools-startup into master Some checks failed Build Hermes agent / build (push) Failing after 2s Details Build ollama (gfx906) / build (push) Failing after 2s Details Reviewed-on: #23	2026-05-13 13:52:36 +00:00
Hermes	5e242eb946	fix: add iptables-nft to wg-easy for nftables-only kernels wg-easy's Alpine wg-quick uses legacy iptables which requires the iptable_nat kernel module. On NixOS kernels compiled without legacy netfilter modules, the container crashes in a restart loop: iptables v1.8.3 (legacy): can't initialize iptables table 'nat' Table does not exist (do you need to insmod?) Fix: build a custom image that installs Alpine's iptables-nft package and symlinks iptables -> iptables-nft (nftables backend).	2026-05-12 14:52:33 -04:00
Hermes	e607982b21	refactor: chown tools dir at build time instead of root at runtime Some checks failed Build Hermes agent / build (pull_request) Failing after 3s Details Build ollama (gfx906) / build (pull_request) Failing after 2s Details	2026-05-12 14:47:34 -04:00
Hermes	4627199217	feat: install custom tools at startup, remove deprecated fix-permissions.sh Some checks failed Build Hermes agent / build (pull_request) Failing after 41m55s Details Build ollama (gfx906) / build (pull_request) Failing after 2s Details	2026-05-12 13:38:26 -04:00