From 78f9d326d92db5591125d5cf97daeea01c060aa9 Mon Sep 17 00:00:00 2001
From: David Cannan <104325852+Cdaprod@users.noreply.github.com>
Date: Sun, 23 Jun 2024 10:39:50 -0400
Subject: [PATCH] Update serve configurations for Minio and Python services.

---
 config/MINIO_SERVE_CONFIG.json                | 19 +++++++++++++++++++
 config/PYTHON_SERVE_CONFIG.json               | 19 +++++++++++++++++++
 .../TS_SERVE_CONFIG.json                      |  0
 config/WEAVIATE_SERVE_CONFIG.JSON             | 19 +++++++++++++++++++
 docker-compose.minio-weaviate-python.ts.yaml  | 12 ++++++------
 5 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 config/MINIO_SERVE_CONFIG.json
 create mode 100644 config/PYTHON_SERVE_CONFIG.json
 rename TS_SERVE_CONFIG.json => config/TS_SERVE_CONFIG.json (100%)
 create mode 100644 config/WEAVIATE_SERVE_CONFIG.JSON

diff --git a/config/MINIO_SERVE_CONFIG.json b/config/MINIO_SERVE_CONFIG.json
new file mode 100644
index 0000000..acb4166
--- /dev/null
+++ b/config/MINIO_SERVE_CONFIG.json
@@ -0,0 +1,19 @@
+{
+  "TCP": {
+    "443": {
+      "HTTPS": true
+    }
+  },
+  "Web": {
+    "minio.${TS_CERT_DOMAIN}:443": {
+      "Handlers": {
+        "/": {
+          "Proxy": "http://127.0.0.1:9001"
+        }
+      }
+    }
+  },
+  "AllowFunnel": {
+    "minio.${TS_CERT_DOMAIN}:443": false
+  }
+}
\ No newline at end of file
diff --git a/config/PYTHON_SERVE_CONFIG.json b/config/PYTHON_SERVE_CONFIG.json
new file mode 100644
index 0000000..04ed9ce
--- /dev/null
+++ b/config/PYTHON_SERVE_CONFIG.json
@@ -0,0 +1,19 @@
+{
+  "TCP": {
+    "443": {
+      "HTTPS": true
+    }
+  },
+  "Web": {
+    "python.${TS_CERT_DOMAIN}:443": {
+      "Handlers": {
+        "/": {
+          "Proxy": "http://127.0.0.1:80"
+        }
+      }
+    }
+  },
+  "AllowFunnel": {
+    "python.${TS_CERT_DOMAIN}:443": false
+  }
+}
\ No newline at end of file
diff --git a/TS_SERVE_CONFIG.json b/config/TS_SERVE_CONFIG.json
similarity index 100%
rename from TS_SERVE_CONFIG.json
rename to config/TS_SERVE_CONFIG.json
diff --git a/config/WEAVIATE_SERVE_CONFIG.JSON b/config/WEAVIATE_SERVE_CONFIG.JSON
new file mode 100644
index 0000000..d10200d
--- /dev/null
+++ b/config/WEAVIATE_SERVE_CONFIG.JSON
@@ -0,0 +1,19 @@
+{
+  "TCP": {
+    "443": {
+      "HTTPS": true
+    }
+  },
+  "Web": {
+    "weaviate.${TS_CERT_DOMAIN}:443": {
+      "Handlers": {
+        "/": {
+          "Proxy": "http://127.0.0.1:8080"
+        }
+      }
+    }
+  },
+  "AllowFunnel": {
+    "weaviate.${TS_CERT_DOMAIN}:443": false
+  }
+}
\ No newline at end of file
diff --git a/docker-compose.minio-weaviate-python.ts.yaml b/docker-compose.minio-weaviate-python.ts.yaml
index d103898..39ed6a7 100644
--- a/docker-compose.minio-weaviate-python.ts.yaml
+++ b/docker-compose.minio-weaviate-python.ts.yaml
@@ -5,11 +5,11 @@ services:
     volumes:
       - /dev/net/tun:/dev/net/tun
       - ./tailscale-minio/state:/var/lib/tailscale
-      - ./TS_SERVE_CONFIG.json:/TS_SERVE_CONFIG.json:ro
+      - ./config/MINIO_SERVE_CONFIG.json:/config/MINIO_SERVE_CONFIG.json:ro
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
       - TS_STATE_DIR=/var/lib/tailscale
-      - TS_SERVE_CONFIG=/TS_SERVE_CONFIG.json
+      - TS_SERVE_CONFIG=/config/MINIO_SERVE_CONFIG.json
       - TS_EXTRA_ARGS=--advertise-routes=192.168.0.0/24 --advertise-tags=tag:infra --accept-routes --advertise-exit-node --ssh
     cap_add:
       - NET_ADMIN
@@ -35,11 +35,11 @@ services:
     volumes:
       - /dev/net/tun:/dev/net/tun
       - ./tailscale-weaviate/state:/var/lib/tailscale
-      - ./TS_SERVE_CONFIG.json:/TS_SERVE_CONFIG.json:ro
+      - ./config/WEAVIATE_SERVE_CONFIG.json:/config/WEAVIATE_SERVE_CONFIG.json:ro
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
       - TS_STATE_DIR=/var/lib/tailscale
-      - TS_SERVE_CONFIG=/TS_SERVE_CONFIG.json
+      - TS_SERVE_CONFIG=/config/WEAVIATE_SERVE_CONFIG.json
       - TS_EXTRA_ARGS=--advertise-routes=192.168.0.0/24 --advertise-tags=tag:infra --accept-routes --advertise-exit-node --ssh
     cap_add:
       - NET_ADMIN
@@ -78,11 +78,11 @@ services:
     volumes:
       - /dev/net/tun:/dev/net/tun
       - ./tailscale-python/state:/var/lib/tailscale
-      - ./TS_SERVE_CONFIG.json:/TS_SERVE_CONFIG.json:ro
+      - ./config/PYTHON_SERVE_CONFIG.json:/config/PYTHON_SERVE_CONFIG.json:ro
     environment:
       - TS_AUTHKEY=${TS_AUTHKEY}
       - TS_STATE_DIR=/var/lib/tailscale
-      - TS_SERVE_CONFIG=/TS_SERVE_CONFIG.json
+      - TS_SERVE_CONFIG=/config/PYTHON_SERVE_CONFIG.json
       - TS_EXTRA_ARGS=--advertise-routes=192.168.0.0/24 --advertise-tags=tag:infra --accept-routes --advertise-exit-node --ssh
     cap_add:
       - NET_ADMIN