From 177a5d1cb2d3a449669f98cc1be2a6f2d36c029f Mon Sep 17 00:00:00 2001
From: Nathan Rashleigh <ntr@strix.systems>
Date: Sun, 15 Jun 2025 14:40:59 +1000
Subject: [PATCH] mnml ingress

---
 mnml/mnml.ingress.yaml | 115 +++++++++++++----------------------------
 1 file changed, 37 insertions(+), 78 deletions(-)

diff --git a/mnml/mnml.ingress.yaml b/mnml/mnml.ingress.yaml
index d369891..1ea219f 100644
--- a/mnml/mnml.ingress.yaml
+++ b/mnml/mnml.ingress.yaml
@@ -1,86 +1,45 @@
 ---
 # -----------------------------------------------------------------------
-# INGRESS
+# COMBINED INGRESS
 # -----------------------------------------------------------------------
 
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: mnml-client
-  namespace: mnml
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
+    name: mnml
+    namespace: mnml
+    annotations:
+        cert-manager.io/cluster-issuer: "letsencrypt-prod"
+        haproxy.org/websocket-support: "true"
+        haproxy.org/timeout-tunnel: "3600s"
 spec:
-  ingressClassName: haproxy
-  tls:
-  - hosts:
-    - mnml.ntwl.xyz
-    secretName: mnml-tls
-  rules:
-  - host: mnml.ntwl.xyz
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: mnml-client
-            port:
-              number: 8080
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: mnml-api
-  namespace: mnml
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
-    haproxy.org/websocket-support: "true"
-spec:
-  ingressClassName: haproxy
-  tls:
-  - hosts:
-    - mnml.ntwl.xyz
-    secretName: mnml-tls
-  rules:
-  - host: mnml.ntwl.xyz
-    http:
-      paths:
-      - path: /api
-        pathType: Prefix
-        backend:
-          service:
-            name: mnml-api
-            port:
-              number: 40000
-
----
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: mnml-ws
-  namespace: mnml
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-prod"
-    haproxy.org/websocket-support: "true"
-    haproxy.org/timeout-tunnel: "3600s"
-spec:
-  ingressClassName: haproxy
-  tls:
-  - hosts:
-    - mnml.ntwl.xyz
-    secretName: mnml-tls
-  rules:
-  - host: mnml.ntwl.xyz
-    http:
-      paths:
-      - path: /api/ws
-        pathType: Exact
-        backend:
-          service:
-            name: mnml-ws
-            port:
-              number: 40055
+    ingressClassName: haproxy
+    tls:
+    - hosts:
+        - mnml.gg
+      secretName: mnml-tls
+    rules:
+    - host: mnml.gg
+      http:
+        paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: mnml-client
+              port:
+                number: 8080
+        - path: /api
+          pathType: Prefix
+          backend:
+            service:
+              name: mnml-api
+              port:
+                number: 40000
+        - path: /api/ws
+          pathType: Exact
+          backend:
+            service:
+              name: mnml-ws
+              port:
+                number: 40055
\ No newline at end of file