revert changes
continuous-integration/drone/push Build is passing Details

This commit is contained in:
quackerd 2022-12-06 12:19:47 +01:00
parent b379b01f43
commit e9615dfc57
4 changed files with 16 additions and 11 deletions

View File

@ -1,6 +1,6 @@
FROM alpine:latest FROM alpine:latest
ENV VER_XRAY 1.6.1 ENV VER_XRAY 1.6.5
ENV VER_SO 2.5.20 ENV VER_SO 2.5.20
ENV VER_NG 1.7.23 ENV VER_NG 1.7.23

View File

@ -116,7 +116,7 @@ for u in users:
jinja_dict["USER"] = u[0] jinja_dict["USER"] = u[0]
jinja_dict["FLOW"] = u[1] jinja_dict["FLOW"] = u[1]
process_directory(user_dir, jinja_dict) 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 -sf /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/android {user_dir}/android/downloads", shell=True)
exit(0) exit(0)

View File

@ -70,8 +70,7 @@
"destOverride": ["http", "tls"] "destOverride": ["http", "tls"]
}, },
"settings": { "settings": {
"auth": "noauth", "udp": true
"udp": false
} }
} }
], ],
@ -97,11 +96,11 @@
}, },
"streamSettings": { "streamSettings": {
"network": "tcp", "network": "tcp",
"security": "xtls", "security": "tls",
"xtlsSettings": { "tlsSettings": {
"serverName": "{{ FQDN }}", "serverName": "{{ FQDN }}",
"allowInsecure": false, "allowInsecure": false,
"alpn": ["h2","http/1.1"] "fingerprint": "firefox"
} }
} }
}, },

View File

@ -21,9 +21,8 @@
}, },
"streamSettings": { "streamSettings": {
"network": "tcp", "network": "tcp",
"security": "xtls", "security": "tls",
"xtlsSettings": { "tlsSettings": {
"alpn": ["http/1.1", "h2"],
"certificates": [ "certificates": [
{ {
"certificateFile": "/etc/letsencrypt/live/{{ FQDN }}/fullchain.pem", "certificateFile": "/etc/letsencrypt/live/{{ FQDN }}/fullchain.pem",
@ -31,6 +30,13 @@
} }
] ]
} }
},
"sniffing": {
"enabled": true,
"destOverride": [
"http",
"tls"
]
} }
} }
], ],