From b4afffbcb05281f565ac7382c2cab68daeb84e0d Mon Sep 17 00:00:00 2001
From: admin <jkilloran@mapletree.email>
Date: Mon, 2 Feb 2026 12:25:55 -0700
Subject: [PATCH] fix for node id's and name with node id

---
 lxc1/p2-apps/forgejo.yml   | 18 +++++++++---------
 lxc1/p2-apps/guacamole.yml |  2 +-
 lxc1/p2-apps/komodo.yml    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lxc1/p2-apps/forgejo.yml b/lxc1/p2-apps/forgejo.yml
index 2afa1aa..e79ea73 100644
--- a/lxc1/p2-apps/forgejo.yml
+++ b/lxc1/p2-apps/forgejo.yml
@@ -1,7 +1,7 @@
 services:
   forgejo:
     image: codeberg.org/forgejo/forgejo:latest
-    container_name: forgejo
+    container_name: fj-node${FJ_NODE_ID}
     restart: always
     environment:
       - FORGEJO__database__DB_TYPE=${FJ_DB_TYPE}
@@ -26,16 +26,16 @@ services:
       - "traefik.docker.network=${TRAEFIK_NETWORK}"
 
       # --- SHARED HA ROUTER (git.domain.com) ---
-      - "traefik.http.routers.forgejo-shared-${FORGEJO_NODE_ID}.rule=Host(`git.${TRAEFIK_DNS_SUFFIX}`)"
-      - "traefik.http.routers.forgejo-shared-${FORGEJO_NODE_ID}.entrypoints=${TRAEFIK_ENTRY_POINTS}"
-      - "traefik.http.routers.forgejo-shared-${FORGEJO_NODE_ID}.tls.certresolver=${TRAEFIK_RESOLVER}"
-      - "traefik.http.routers.forgejo-shared-${FORGEJO_NODE_ID}.service=forgejo-common-svc"
+      - "traefik.http.routers.forgejo-shared-${FJ_NODE_ID}.rule=Host(`git.${TRAEFIK_DNS_SUFFIX}`)"
+      - "traefik.http.routers.forgejo-shared-${FJ_NODE_ID}.entrypoints=${TRAEFIK_ENTRY_POINTS}"
+      - "traefik.http.routers.forgejo-shared-${FJ_NODE_ID}.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.forgejo-shared-${FJ_NODE_ID}.service=forgejo-common-svc"
 
       # --- NODE-SPECIFIC ADMIN ROUTER (git1... git2...) ---
-      - "traefik.http.routers.forgejo-admin-${FORGEJO_NODE_ID}.rule=Host(`git${FORGEJO_NODE_ID}.${TRAEFIK_DNS_SUFFIX}`)"
-      - "traefik.http.routers.forgejo-admin-${FORGEJO_NODE_ID}.entrypoints=${TRAEFIK_ENTRY_POINTS}"
-      - "traefik.http.routers.forgejo-admin-${FORGEJO_NODE_ID}.tls.certresolver=${TRAEFIK_RESOLVER}"
-      - "traefik.http.routers.forgejo-admin-${FORGEJO_NODE_ID}.service=forgejo-common-svc"
+      - "traefik.http.routers.forgejo-admin-${FJ_NODE_ID}.rule=Host(`git${FJ_NODE_ID}.${TRAEFIK_DNS_SUFFIX}`)"
+      - "traefik.http.routers.forgejo-admin-${FJ_NODE_ID}.entrypoints=${TRAEFIK_ENTRY_POINTS}"
+      - "traefik.http.routers.forgejo-admin-${FJ_NODE_ID}.tls.certresolver=${TRAEFIK_RESOLVER}"
+      - "traefik.http.routers.forgejo-admin-${FJ_NODE_ID}.service=forgejo-common-svc"
 
       # --- SHARED SERVICE ---
       - "traefik.http.services.forgejo-common-svc.loadbalancer.server.port=3000"
diff --git a/lxc1/p2-apps/guacamole.yml b/lxc1/p2-apps/guacamole.yml
index 615392a..49f3c93 100644
--- a/lxc1/p2-apps/guacamole.yml
+++ b/lxc1/p2-apps/guacamole.yml
@@ -13,7 +13,7 @@ services:
 
   guacamole:
     image: guacamole/guacamole:latest
-    container_name: guacamole
+    container_name: guac-node${GUAC_NODE_ID}
     restart: always
     user: root
     ports:
diff --git a/lxc1/p2-apps/komodo.yml b/lxc1/p2-apps/komodo.yml
index 525a2b6..58faae1 100644
--- a/lxc1/p2-apps/komodo.yml
+++ b/lxc1/p2-apps/komodo.yml
@@ -12,7 +12,7 @@ services:
 
   komodo:
     image: ghcr.io/moghtech/komodo-core:latest
-    container_name: komodo
+    container_name: komodo-node${KOMODO_NODE_ID}
     cpus: 2.0
     mem_limit: "2048m"
     mem_reservation: "512m"