From 48274a54f92032e1b66cff37d45ecd379f9b64bd Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Sat, 25 Oct 2025 22:36:47 -0500
Subject: [PATCH] split garage tailscale

---
 .../cl01tl/applications/homepage/values.yaml  |  4 +--
 hosts/ps10rp/blocky/config.yml                |  2 +-
 hosts/ps10rp/garage/compose.yaml              | 32 +++++++++++++++----
 hosts/ps10rp/garage/serve-ui.json             | 16 ++++++++++
 hosts/ps10rp/garage/serve.json                | 10 ------
 5 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 hosts/ps10rp/garage/serve-ui.json

diff --git a/clusters/cl01tl/applications/homepage/values.yaml b/clusters/cl01tl/applications/homepage/values.yaml
index 1245a8235..ea0aa7529 100644
--- a/clusters/cl01tl/applications/homepage/values.yaml
+++ b/clusters/cl01tl/applications/homepage/values.yaml
@@ -495,8 +495,8 @@ homepage:
               - Remote Storage:
                   icon: sh-garage.webp
                   description: Garage
-                  href: https://garage-ps10rp.boreal-beaufort.ts.net
-                  siteMonitor: https://garage-ps10rp.boreal-beaufort.ts.net
+                  href: https://garage-ui-ps10rp.boreal-beaufort.ts.net
+                  siteMonitor: https://garage-ui-ps10rp.boreal-beaufort.ts.net
                   statusStyle: dot
               - Database:
                   icon: sh-pgadmin-light.webp
diff --git a/hosts/ps10rp/blocky/config.yml b/hosts/ps10rp/blocky/config.yml
index b1907b07a..7df0eee27 100644
--- a/hosts/ps10rp/blocky/config.yml
+++ b/hosts/ps10rp/blocky/config.yml
@@ -43,7 +43,7 @@ customDNS:
 
     ;; Application Names
     traefik-ps10rp                  IN      CNAME   ps10rp
-    garage                          IN      CNAME   ps10rp
+    garage-ui                       IN      CNAME   ps10rp
     gitea                           IN      CNAME   ps10rp
     www                             IN      CNAME   ps10rp
     homepage                        IN      CNAME   ps10rp
diff --git a/hosts/ps10rp/garage/compose.yaml b/hosts/ps10rp/garage/compose.yaml
index b36a75597..1b0076949 100644
--- a/hosts/ps10rp/garage/compose.yaml
+++ b/hosts/ps10rp/garage/compose.yaml
@@ -18,6 +18,25 @@ services:
         devices:
             - /dev/net/tun:/dev/net/tun
 
+    tailscale-garage-ui:
+        image: ghcr.io/tailscale/tailscale:v1.88.4
+        container_name: tailscale-garage-ui
+        cap_add:
+            - net_admin
+            - sys_module
+        environment:
+            - TS_STATE_DIR=/var/lib/tailscale
+            - TS_ENABLE_METRICS=true
+            - TS_HOSTNAME=garage-ui-ps10rp
+            - TS_SERVE_CONFIG=/config/serve-ui.json
+        restart: always
+        network_mode: service:garage-ui
+        volumes:
+            - tailscale:/var/lib/tailscale
+            - ${PWD}/serve.json:/config/serve-ui.json:ro
+        devices:
+            - /dev/net/tun:/dev/net/tun
+
     garage:
         image: dxflrs/garage:v2.1.0
         container_name: garage
@@ -31,23 +50,24 @@ services:
             - meta:/var/lib/garage/meta
             - data:/var/lib/garage/data
 
-    webui:
+    garage-ui:
         image: khairul169/garage-webui:1.1.0
-        container_name: garage-webui
+        container_name: garage-ui
         env_file:
             - .env
         environment:
-            API_BASE_URL: "http://127.0.0.1:3903"
-            S3_ENDPOINT_URL: "http://127.0.0.1:3900"
+            API_BASE_URL: "http://garage:3903"
+            S3_ENDPOINT_URL: "http://garage:3900"
         labels:
             traefik.enable: true
             traefik.docker.network: internal
             traefik.http.routers.garage-webui.entrypoints: web-secure
-            traefik.http.routers.garage-webui.rule: Host(`garage.lebens-home.net`)
+            traefik.http.routers.garage-webui.rule: Host(`garage-ui.lebens-home.net`)
             traefik.http.routers.garage-webui.service: garage-webui
             traefik.http.services.garage-webui.loadbalancer.server.port: 3009
         restart: always
-        network_mode: service:garage
+        networks:
+            internal: null
         volumes:
             - ${PWD}/garage.toml:/etc/garage.toml:ro
 
diff --git a/hosts/ps10rp/garage/serve-ui.json b/hosts/ps10rp/garage/serve-ui.json
new file mode 100644
index 000000000..dd88d23ae
--- /dev/null
+++ b/hosts/ps10rp/garage/serve-ui.json
@@ -0,0 +1,16 @@
+{
+  "TCP": {
+    "443": {
+      "HTTPS": true
+    }
+  },
+  "Web": {
+    "${TS_CERT_DOMAIN}:443": {
+      "Handlers": {
+        "/": {
+          "Proxy": "http://127.0.0.1:3909"
+        }
+      }
+    }
+  }
+}
diff --git a/hosts/ps10rp/garage/serve.json b/hosts/ps10rp/garage/serve.json
index e8012e126..32639f23a 100644
--- a/hosts/ps10rp/garage/serve.json
+++ b/hosts/ps10rp/garage/serve.json
@@ -1,8 +1,5 @@
 {
   "TCP": {
-    "443": {
-      "HTTPS": true
-    },
     "3900": {
       "HTTPS": true
     },
@@ -17,13 +14,6 @@
     }
   },
   "Web": {
-    "${TS_CERT_DOMAIN}:443": {
-      "Handlers": {
-        "/": {
-          "Proxy": "http://127.0.0.1:3909"
-        }
-      }
-    },
     "${TS_CERT_DOMAIN}:3900": {
       "Handlers": {
         "/": {