From 597824c8e0238e351e5804fe30cd72175e5c0fd7 Mon Sep 17 00:00:00 2001
From: "Lockszmith (@Kateryna)" <code@lksz.me>
Date: Thu, 27 Feb 2025 18:39:51 -0500
Subject: [PATCH 1/5] Add kateryna-o traefik route

---
 .../dynamic/_templates/rt.kateryna-0.yml.sz   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 _traefik/dynamic/_templates/rt.kateryna-0.yml.sz

diff --git a/_traefik/dynamic/_templates/rt.kateryna-0.yml.sz b/_traefik/dynamic/_templates/rt.kateryna-0.yml.sz
new file mode 100644
index 0000000..d888898
--- /dev/null
+++ b/_traefik/dynamic/_templates/rt.kateryna-0.yml.sz
@@ -0,0 +1,31 @@
+# http routing section
+http:
+  routers:
+    kateryna-szk:
+      rule: "Host(`kateryna.szk.li`) && PathPrefix(`/`)"
+      entrypoints:
+      - websecure
+      service: kateryna
+      tls:
+        certresolver: myresolver
+    kateryna-lksz:
+      rule: "Host(`kateryna.lksz.me`) && PathPrefix(`/`)"
+      entrypoints:
+      - websecure
+      service: kateryna
+      tls:
+        certresolver: myresolver
+    kateryna-k-lksz:
+      rule: "Host(`k.lksz.me`) && PathPrefix(`/`)"
+      entrypoints:
+      - websecure
+      service: kateryna
+      tls:
+        certresolver: myresolver
+
+  services:
+    # Define how to reach an existing service on our infrastructure
+    kateryna:
+      loadBalancer:
+        servers:
+        - url: http://192.168.222.1:11080

From 5ae4511e955dc4ee4006b5e99173dc0fd635217b Mon Sep 17 00:00:00 2001
From: "Lockszmith (@Kateryna)" <code@lksz.me>
Date: Tue, 4 Mar 2025 23:00:19 -0500
Subject: [PATCH 2/5] ignore **/config.json

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8554309..2e43810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ _traefik/shared
 tmp.*
 *.tmp
 *.off
+# Exclude specific local configurations
+**/config.json
+
 
 _secrets/*
 !_secrets/README.md

From 1a141c6dcc1d50698fab7751899dd47e3417aec0 Mon Sep 17 00:00:00 2001
From: "Lockszmith (@Kateryna)" <code@lksz.me>
Date: Tue, 4 Mar 2025 23:01:16 -0500
Subject: [PATCH 3/5] fix: traefik not using correct network for vaultwarden

---
 vaultwarden/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index b1f4e2b..e9ab9fa 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     labels:
       # Websecure
       traefik.http.routers.vaultwarden.rule: Host(`vault.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-      traefik.docker.network: tipi_main_network #runtipi_tipi_main_network
+      traefik.docker.network: runtipi_tipi_main_network
 networks:
   vaultwarden-pg:
     external: true

From f069f0772dbf17da8a8fa4a29810cc46170ee99e Mon Sep 17 00:00:00 2001
From: "Lockszmith (@Kateryna)" <code@lksz.me>
Date: Thu, 6 Mar 2025 00:43:29 -0500
Subject: [PATCH 4/5] remove dockge

---
 dockge/docker-compose.yml | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 dockge/docker-compose.yml

diff --git a/dockge/docker-compose.yml b/dockge/docker-compose.yml
deleted file mode 100644
index 29831af..0000000
--- a/dockge/docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-services:
-  dockge:
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /srv/dockge/stacks:/srv/dockge/stacks
-    environment:
-      DOCKGE_STACKS_DIR: /srv/dockge/stacks
-      
-      # RUNTIPI Environment
-      RUNTIPI_APP_PORT: "${APP_PORT}"
-      RUNTIPI_APP_ID: "${APP_ID}"
-      RUNTIPI_APP_DATA_DIR: "${APP_DATA_DIR}"
-      RUNTIPI_APP_EXPOSED: "${APP_EXPOSED:-}"
-      RUNTIPI_APP_DOMAIN: "${APP_DOMAIN}"
-      RUNTIPI_APP_HOST: "${APP_HOST}"
-      RUNTIPI_LOCAL_DOMAIN: "${LOCAL_DOMAIN}"
-      RUNTIPI_DOMAIN: "${DOMAIN}"
-      RUNTIPI_ROOT_DOMAIN: "${ROOT_DOMAIN}"
-      HOST_UID: "${HOST_UID}"
-      HOST_GID: "${HOST_GID}"
-      PUID: "${HOST_UID}"
-      PGID: "${HOST_GID}"
-      TZ: "${TZ:?Did you forget to define TZ in the root RunTipi .env.local?}"
-    labels:
-      traefik.http.routers.dockge.rule: Host(`dockge.${ROOT_DOMAIN}`)${APP_ROUTE_OPTIONAL:-}
-      traefik.http.routers.dockge.middlewares: authentik_sysmgr@file
-
-      # traefik.enable: true
-      # # traefik.http.services.dockge.loadbalancer.server.port: 5001
-      # traefik.http.routers.dockge.entrypoints: websecure
-      # traefik.http.routers.dockge.service: dockge
-      # traefik.http.routers.dockge.tls.certresolver: myresolver

From eeecd047e0d1f5fe311e239b0a0e45dc1bcd011d Mon Sep 17 00:00:00 2001
From: "Lockszmith (@Kateryna)" <code@lksz.me>
Date: Thu, 6 Mar 2025 00:44:46 -0500
Subject: [PATCH 5/5] Use ALT_ROOT_DOMAIN in vaultwarden

---
 vaultwarden/app.env.local | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vaultwarden/app.env.local b/vaultwarden/app.env.local
index 4e04219..def658c 100644
--- a/vaultwarden/app.env.local
+++ b/vaultwarden/app.env.local
@@ -1,4 +1,4 @@
-# VARIABLE=value #comment# VARIABLE=value #comment
-#APP_ROUTE_OPTIONAL=" || Host(`vault.lksz.me`)"
+# VARIABLE=value #comment
+APP_ROUTE_OPTIONAL=${ALT_ROOT_DOMAIN:+ || Host(`vault.${ALT_ROOT_DOMAIN}`)}
 VAULTWARDEN_POSTGRES_PASSWORD="Create a new DB Password here"
 VAULTWARDEN_ADMIN_PASSWORD="User argon2 hash"