From aa527bd068cba8866770e9e32e805119e28978bc Mon Sep 17 00:00:00 2001
From: Opnxng <opnxng@tuta.io>
Date: Mon, 16 Sep 2024 09:40:24 +0800
Subject: [PATCH] Removed Proxitok

---
 templates/conf/Caddyfile.j2 | 41 +++++++++++++++++++++----------------
 vars/services.yaml          | 14 ++++++-------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/templates/conf/Caddyfile.j2 b/templates/conf/Caddyfile.j2
index c2721ee..69c5c4b 100755
--- a/templates/conf/Caddyfile.j2
+++ b/templates/conf/Caddyfile.j2
@@ -155,6 +155,11 @@
 		redir https://opnxng.com{uri}
 	}
 
+	@tt host tt.{$HOSTNAME}
+	handle @tt {
+		redir https://about.opnxng.com/blog/#proxitok
+	}
+
 	@yt host yt.{$HOSTNAME}
 	handle @yt {
 		redir https://about.opnxng.com/blog/#cloudtube
@@ -566,24 +571,24 @@
 		}
 	}
 
-	@tt host tt.{$HOSTNAME}
-	handle @tt {
-		encode zstd gzip
-		reverse_proxy {
-			to {{ oracle1_private_ip }}:8909
-			to {{ oracle2_private_ip }}:8909
-			to {{ oracle3_private_ip }}:8909
-			to {{ oracle4_private_ip }}:8909
-			lb_policy ip_hash
-			lb_try_duration 5s
-			lb_try_interval 1s
-			fail_duration 30s
-			max_fails 3
-		}
-		header {
-			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
-		}
-	}
+#	@tt host tt.{$HOSTNAME}
+#	handle @tt {
+#		encode zstd gzip
+#		reverse_proxy {
+#			to {{ oracle1_private_ip }}:8909
+#			to {{ oracle2_private_ip }}:8909
+#			to {{ oracle3_private_ip }}:8909
+#			to {{ oracle4_private_ip }}:8909
+#			lb_policy ip_hash
+#			lb_try_duration 5s
+#			lb_try_interval 1s
+#			fail_duration 30s
+#			max_fails 3
+#		}
+#		header {
+#			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
+#		}
+#	}
 
 	@ti host ti.{$HOSTNAME}
 	handle @ti {
diff --git a/vars/services.yaml b/vars/services.yaml
index d81a0b3..6bb7df0 100644
--- a/vars/services.yaml
+++ b/vars/services.yaml
@@ -1,12 +1,10 @@
-compose:
-  oracle1:
-    - photon
-  oracle2:
-    - photon
-  oracle3:
-    - photon
+config:
   oracle4:
-    - photon
+    - caddy
+
+compose:
+  oracle4:
+    - caddy
 
 # ----------------------------------------------------------------------------------------------------