From 5c7de8f3ca743003d1ca2238f4506506fc6d60f6 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Wed, 15 Jan 2025 13:45:53 -0600
Subject: [PATCH] update subnet router

---
 .../tailscale-subnet/docker-compose.yml       | 23 ++++++++++++++++
 hosts/ps10rp/tailscale/.env                   |  5 ----
 hosts/ps10rp/tailscale/docker-compose.yml     | 27 -------------------
 3 files changed, 23 insertions(+), 32 deletions(-)
 create mode 100644 hosts/ps10rp/tailscale-subnet/docker-compose.yml
 delete mode 100644 hosts/ps10rp/tailscale/.env
 delete mode 100644 hosts/ps10rp/tailscale/docker-compose.yml

diff --git a/hosts/ps10rp/tailscale-subnet/docker-compose.yml b/hosts/ps10rp/tailscale-subnet/docker-compose.yml
new file mode 100644
index 000000000..ee4a16b89
--- /dev/null
+++ b/hosts/ps10rp/tailscale-subnet/docker-compose.yml
@@ -0,0 +1,23 @@
+services:
+    tailscale:
+        image: ghcr.io/tailscale/tailscale:v1.78.3
+        container_name: tailscale-subnet
+        cap_add:
+            - net_admin
+            - sys_module
+        environment:
+            - TS_STATE_DIR=/var/lib/tailscale
+            - TS_ENABLE_METRICS=true
+            - TS_HOSTNAME=subnet-router-local-ps10rp
+            - TS_ROUTES=192.168.5.0/24
+            - TS_EXTRA_ARGS=--stateful-filtering=false --snat-subnet-routes=false
+        network_mode: host
+        privileged: true
+        restart: always
+        volumes:
+            - tailscale:/var/lib/tailscale
+        devices:
+            - /dev/net/tun:/dev/net/tun
+
+volumes:
+    tailscale:
diff --git a/hosts/ps10rp/tailscale/.env b/hosts/ps10rp/tailscale/.env
deleted file mode 100644
index 737c95d37..000000000
--- a/hosts/ps10rp/tailscale/.env
+++ /dev/null
@@ -1,5 +0,0 @@
-TS_AUTHKEY=""
-TS_HOSTNAME=ps10rp
-TS_ROUTES=192.168.5.0/24
-TS_STATE_DIR=/var/lib/tailscale
-TS_EXTRA_ARGS=--stateful-filtering=false --snat-subnet-routes=false
diff --git a/hosts/ps10rp/tailscale/docker-compose.yml b/hosts/ps10rp/tailscale/docker-compose.yml
deleted file mode 100644
index 3ce0d4045..000000000
--- a/hosts/ps10rp/tailscale/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-services:
-    tailscaled:
-        cap_add:
-            - NET_ADMIN
-            - NET_RAW
-        container_name: tailscaled
-        dns:
-            - 172.19.0.3
-            - 1.1.1.1
-        env_file:
-            - .env
-        hostname: ps10rp
-        image: docker.io/tailscale/tailscale:stable
-        network_mode: host
-        privileged: true
-        restart: always
-        volumes:
-            - tailscale:/var/lib/tailscale
-            - /dev/net/tun:/dev/net/tun
-
-volumes:
-    tailscale:
-        driver: local
-        driver_opts:
-            type: none
-            o: bind
-            device: /mnt/data/containers/tailscale