From e9615dfc57cf0ad56f88819a7927703c82e4eadd Mon Sep 17 00:00:00 2001
From: quackerd <quackerd@deh.nat.quacker.org>
Date: Tue, 6 Dec 2022 12:19:47 +0100
Subject: [PATCH] revert changes

---
 Dockerfile                     |  2 +-
 opt/init.py                    |  4 ++--
 opt/user/others/config.json.in |  9 ++++-----
 opt/xray/d2ray.json.in         | 12 +++++++++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1ba22dd..f827d5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ENV VER_XRAY 1.6.1
+ENV VER_XRAY 1.6.5
 ENV VER_SO 2.5.20
 ENV VER_NG 1.7.23
 
diff --git a/opt/init.py b/opt/init.py
index 7d4f0c7..35ea859 100644
--- a/opt/init.py
+++ b/opt/init.py
@@ -116,7 +116,7 @@ for u in users:
     jinja_dict["USER"] = u[0]
     jinja_dict["FLOW"] = u[1]
     process_directory(user_dir, jinja_dict)
-    subprocess.check_call(f"ln -s /downloads/others {user_dir}/others/downloads", shell=True)
-    subprocess.check_call(f"ln -s /downloads/android {user_dir}/android/downloads", shell=True)
+    subprocess.check_call(f"ln -sf /downloads/others {user_dir}/others/downloads", shell=True)
+    subprocess.check_call(f"ln -sf /downloads/android {user_dir}/android/downloads", shell=True)
 
 exit(0)
\ No newline at end of file
diff --git a/opt/user/others/config.json.in b/opt/user/others/config.json.in
index 14abe90..9607f7a 100644
--- a/opt/user/others/config.json.in
+++ b/opt/user/others/config.json.in
@@ -70,8 +70,7 @@
         "destOverride": ["http", "tls"]
       },
       "settings": {
-        "auth": "noauth",
-        "udp": false
+        "udp": true
       }
     }
   ],
@@ -97,11 +96,11 @@
       },
       "streamSettings": {
         "network": "tcp",
-        "security": "xtls",
-        "xtlsSettings": {
+        "security": "tls",
+        "tlsSettings": {
             "serverName": "{{ FQDN }}",
             "allowInsecure": false,
-            "alpn": ["h2","http/1.1"]
+            "fingerprint": "firefox"
         }
       }
     },
diff --git a/opt/xray/d2ray.json.in b/opt/xray/d2ray.json.in
index b62756f..2f0db1d 100644
--- a/opt/xray/d2ray.json.in
+++ b/opt/xray/d2ray.json.in
@@ -21,9 +21,8 @@
         },
         "streamSettings": {
           "network": "tcp",
-          "security": "xtls",
-          "xtlsSettings": {
-            "alpn": ["http/1.1", "h2"],
+          "security": "tls",
+          "tlsSettings": {
             "certificates": [
               {
                 "certificateFile": "/etc/letsencrypt/live/{{ FQDN }}/fullchain.pem",
@@ -31,6 +30,13 @@
               }
             ]
           }
+        },
+        "sniffing": {
+                "enabled": true,
+                "destOverride": [
+                    "http",
+                    "tls"
+                ]
         }
       }
     ],