From 613af4d1571cf75bd914a1721df6ab58a4f7c143 Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Wed, 15 Jan 2025 18:16:45 -0600
Subject: [PATCH] add gitea

---
 hosts/ps10rp/gitea/.env               |  8 ----
 hosts/ps10rp/gitea/.postgresql.env    |  3 --
 hosts/ps10rp/gitea/compose.yaml       | 65 +++++++++++++++++++++++++++
 hosts/ps10rp/gitea/docker-compose.yml | 61 -------------------------
 hosts/ps10rp/gitea/serve.json         | 19 ++++++++
 5 files changed, 84 insertions(+), 72 deletions(-)
 delete mode 100644 hosts/ps10rp/gitea/.env
 delete mode 100644 hosts/ps10rp/gitea/.postgresql.env
 create mode 100644 hosts/ps10rp/gitea/compose.yaml
 delete mode 100644 hosts/ps10rp/gitea/docker-compose.yml
 create mode 100644 hosts/ps10rp/gitea/serve.json

diff --git a/hosts/ps10rp/gitea/.env b/hosts/ps10rp/gitea/.env
deleted file mode 100644
index ae52c1d39..000000000
--- a/hosts/ps10rp/gitea/.env
+++ /dev/null
@@ -1,8 +0,0 @@
-USER_UID=1000
-USER_GID=1000
-GITEA__database__DB_TYPE=postgres
-GITEA__database__HOST=gitea-postgres:5432
-GITEA__database__NAME=gitea
-GITEA__database__USER=gitea
-GITEA__database__PASSWD=""
-GITEA__webhook__ALLOWED_HOST_LIST="*.lebens-home.net, 192.168.*.*, 172.27.*.*"
diff --git a/hosts/ps10rp/gitea/.postgresql.env b/hosts/ps10rp/gitea/.postgresql.env
deleted file mode 100644
index 115663516..000000000
--- a/hosts/ps10rp/gitea/.postgresql.env
+++ /dev/null
@@ -1,3 +0,0 @@
-POSTGRES_USER=gitea
-POSTGRES_PASSWORD=""
-POSTGRES_DB=gitea
diff --git a/hosts/ps10rp/gitea/compose.yaml b/hosts/ps10rp/gitea/compose.yaml
new file mode 100644
index 000000000..c40b766d3
--- /dev/null
+++ b/hosts/ps10rp/gitea/compose.yaml
@@ -0,0 +1,65 @@
+services:
+    tailscale-gitea:
+        image: ghcr.io/tailscale/tailscale:v1.78.3
+        container_name: tailscale-gitea
+        cap_add:
+            - net_admin
+            - sys_module
+        environment:
+            - TS_STATE_DIR=/var/lib/tailscale
+            - TS_ENABLE_METRICS=true
+            - TS_HOSTNAME=gitea-ps10rp
+            - TS_SERVE_CONFIG=/config/serve.json
+        network_mode: service:gitea
+        restart: always
+        volumes:
+            - tailscale:/var/lib/tailscale
+            - ${PWD}/serve.json:/config/serve.json
+        devices:
+            - /dev/net/tun:/dev/net/tun
+
+    postgresql:
+        image: docker.io/postgres:17.2-alpine3.21
+        container_name: gitea-postgres
+        environment:
+            - POSTGRES_USER=gitea
+            - POSTGRES_DB=gitea
+        network_mode: service:gitea
+        restart: always
+        volumes:
+            - postgresql:/var/lib/postgresql/data
+
+    gitea:
+        image: docker.io/gitea/gitea:latest
+        container_name: gitea
+        depends_on:
+            - postgresql
+        environment:
+            - GITEA__database__DB_TYPE=postgres
+            - GITEA__database__HOST=localhost:5432
+            - GITEA__database__NAME=gitea
+            - GITEA__database__USER=gitea
+        labels:
+            traefik.enable: true
+            traefik.docker.network: traefik
+            traefik.http.routers.gitea.entrypoints: websecure
+            traefik.http.routers.gitea.rule: Host(`gitea.lebens-home.net`)
+            traefik.http.routers.gitea.service: gitea
+            traefik.http.services.gitea.loadbalancer.server.port: 3000
+        networks:
+            internal: null
+        restart: always
+        volumes:
+            - gitea:/data
+            - /etc/timezone:/etc/timezone:ro
+            - /etc/localtime:/etc/localtime:ro
+
+networks:
+    internal:
+        name: internal
+        external: true
+
+volumes:
+    tailscale:
+    postgresql:
+    gitea:
diff --git a/hosts/ps10rp/gitea/docker-compose.yml b/hosts/ps10rp/gitea/docker-compose.yml
deleted file mode 100644
index fc4830234..000000000
--- a/hosts/ps10rp/gitea/docker-compose.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-services:
-    gitea:
-        container_name: gitea
-        depends_on:
-            - postgresql
-        dns:
-            - 172.19.0.3
-            - 1.1.1.1
-        env_file:
-            - .env
-        image: docker.io/gitea/gitea:latest
-        labels:
-            traefik.docker.network: traefik
-            traefik.enable: true
-            traefik.http.routers.gitea.entrypoints: websecure
-            traefik.http.routers.gitea.rule: Host(`gitea.lebens-home.net`)
-            traefik.http.routers.gitea.service: gitea
-            traefik.http.services.gitea.loadbalancer.server.port: 3000
-        networks:
-            traefik: null
-        ports:
-            - 2222:22
-        restart: always
-        volumes:
-            - gitea_data:/data
-            - /etc/timezone:/etc/timezone:ro
-            - /etc/localtime:/etc/localtime:ro
-
-    postgresql:
-        container_name: gitea-postgres
-        dns:
-            - 172.19.0.3
-            - 1.1.1.1
-        env_file:
-            - .postgresql.env
-        image: docker.io/postgres:17
-        networks:
-            traefik: null
-        restart: always
-        volumes:
-            - postgresql:/var/lib/postgresql/data
-
-networks:
-    traefik:
-        name: traefik
-        external: true
-
-volumes:
-    postgresql:
-        driver: local
-        driver_opts:
-            type: none
-            o: bind
-            device: /mnt/data/containers/gitea/postgresql
-
-    gitea_data:
-        driver: local
-        driver_opts:
-            type: none
-            o: bind
-            device: /mnt/data/containers/gitea/data
diff --git a/hosts/ps10rp/gitea/serve.json b/hosts/ps10rp/gitea/serve.json
new file mode 100644
index 000000000..a5c125e1d
--- /dev/null
+++ b/hosts/ps10rp/gitea/serve.json
@@ -0,0 +1,19 @@
+{
+  "TCP": {
+    "443": {
+      "HTTPS": true
+    }
+  },
+  "Web": {
+    "${TS_CERT_DOMAIN}:443": {
+      "Handlers": {
+        "/": {
+          "Proxy": "http://127.0.0.1:3000"
+        }
+      }
+    }
+  },
+  "AllowFunnel": {
+    "${TS_CERT_DOMAIN}:443": true
+  }
+}