Skip to content

Commit 1375ce1

Browse files
lymanjrelymanjre
authored
Merge pull request #4849 from tesilaaliset/fix/fix_relase_bugs
2 parents 1d6e190 + 1d2b77d commit 1375ce1

13 files changed

+366
-387
lines changed

‎xray/configs/05_inbounds_10_trojan_ws_new.json.j2‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
{
2-
{% if hconfigs['trojan_enable'] and hconfigs['ws_enable'] %}
3-
"inbounds": [
4-
{
5-
"tag": "trojan-xhttp-new",
6-
"listen": "@@trojan-ws-new", //trojan+xhttp listener process
7-
"protocol": "trojan",
8-
"settings": {
9-
"clients": [
10-
{% for u in users %}
11-
{"password": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"} {% if not loop.last %},{% endif %}
12-
{% endfor %}
13-
]
14-
},
15-
"streamSettings": {
16-
"network": "xhttp",
17-
"security": "none",
18-
"xhttpSettings": {
19-
"mode": "stream-up",
20-
"path": "/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_ws'] }}"
21-
},
22-
"tcpSettings": {
23-
"acceptProxyProtocol": true
24-
}
25-
},
26-
"sniffing": {
27-
"enabled": true,
28-
"destOverride": ["http", "tls", "quic"]
29-
}
30-
}
31-
]
32-
{% endif %}
2+
{% if hconfigs['trojan_enable'] and hconfigs['ws_enable'] %}
3+
"inbounds": [
4+
{
5+
"tag":"trojan-ws-new",
6+
"listen": "@@trojan-ws-new", //trojan+ws listener process
7+
"protocol": "trojan",
8+
"settings": {
9+
"clients": [
10+
{% for u in users %}
11+
{"password": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"},
12+
{% endfor %}
13+
]
14+
},
15+
"streamSettings": {
16+
"network": "ws",
17+
"security": "none",
18+
"wsSettings": {
19+
"acceptProxyProtocol": true,
20+
"path":"/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_ws'] }}",
21+
}
22+
},
23+
"sniffing": {
24+
"enabled": true,
25+
"destOverride": ["http","tls", "quic"]
26+
}
27+
}
28+
]
29+
{% endif %}
3330
}

‎xray/configs/05_inbounds_10_vless_ws_new.json.j2‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
{
2-
{% if hconfigs['vless_enable'] and hconfigs['ws_enable'] %}
3-
"inbounds": [
4-
{
5-
"tag": "vless-xhttp-new",
6-
"listen": "@@vless-ws-new",
7-
"protocol": "vless",
8-
"settings": {
9-
"clients": [
10-
{% for u in users %}
11-
{"id": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"} {% if not loop.last %},{% endif %}
12-
{% endfor %}
13-
],
14-
"decryption": "none"
15-
},
16-
"streamSettings": {
17-
"network": "xhttp",
18-
"security": "none",
19-
"xhttpSettings": {
20-
"mode": "stream-up",
21-
"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_ws'] }}"
22-
},
23-
"tcpSettings": {
24-
"acceptProxyProtocol": true
25-
}
26-
},
27-
"sniffing": {
28-
"enabled": true,
29-
"destOverride": ["http", "tls", "quic"]
30-
}
31-
}
32-
]
33-
{% endif %}
2+
{% if hconfigs['vless_enable'] and hconfigs['ws_enable'] %}
3+
"inbounds": [
4+
{
5+
"tag":"vless-ws-new",
6+
"listen": "@@vless-ws-new",
7+
"protocol": "vless",
8+
"settings": {
9+
"clients": [
10+
{% for u in users %}
11+
{"id": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"},
12+
{% endfor %}
13+
],
14+
"decryption": "none"
15+
},
16+
"streamSettings": {
17+
"network": "ws",
18+
"security": "none",
19+
"wsSettings": {
20+
"acceptProxyProtocol": true,
21+
"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_ws'] }}",
22+
}
23+
},
24+
"sniffing": {
25+
"enabled": true,
26+
"destOverride": ["http","tls", "quic"]
27+
}
28+
}
29+
]
30+
{% endif %}
3431
}

‎xray/configs/05_inbounds_h2_ss_ws_new.json.j2‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
{
2-
{% if hconfigs['vmess_enable'] and hconfigs['ws_enable'] %}
3-
"inbounds": [
4-
{
5-
"tag": "vmess-xhttp-new",
6-
"listen": "@@vmess-ws-new",
7-
"protocol": "vmess",
8-
"settings": {
9-
"clients": [
10-
{% for u in users %}
11-
{"id": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com", "alterId": 0} {% if not loop.last %},{% endif %}
12-
{% endfor %}
13-
]
14-
},
15-
"streamSettings": {
16-
"network": "xhttp",
17-
"security": "none",
18-
"xhttpSettings": {
19-
"mode": "stream-up",
20-
"path": "/{{ hconfigs['path_vmess'] }}{{ hconfigs['path_ws'] }}"
21-
},
22-
"tcpSettings": {
23-
"acceptProxyProtocol": true
24-
}
25-
},
26-
"sniffing": {
27-
"enabled": true,
28-
"destOverride": ["http", "tls", "quic"]
29-
}
30-
}
31-
]
32-
{% endif %}
2+
{% if (hconfigs['shadowsocks2022_enable'] or hconfigs['ssfaketls_enable'] or hconfigs['shadowtls_enable']) and hconfigs['ws_enable'] and hconfigs['h2_enable'] %}
3+
"inbounds": [
4+
{
5+
"tag":"h2-ss-ws-new",
6+
//"listen": "@@v2ray-ws-new",
7+
"listen": "/opt/hiddify-manager/xray/run/ssw.sock,666",
8+
"protocol": "shadowsocks",
9+
"settings": {
10+
"clients":[
11+
{% for u in users %}
12+
{"password": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com","method": "Chacha20-IETF-Poly1305"},
13+
{% endfor %}
14+
]
15+
},
16+
"streamSettings": {
17+
"network": "ws",
18+
"security": "none",
19+
"wsSettings": {
20+
//"acceptProxyProtocol": true,
21+
"path": "/{{ hconfigs['path_ss'] }}{{ hconfigs['path_ws'] }}",
22+
}
23+
},
24+
"sniffing": {
25+
"enabled": true,
26+
"destOverride": ["http","tls", "quic"]
27+
}
28+
}
29+
]
30+
{% endif %}
3331
}

‎xray/configs/05_inbounds_h2_trojan_ws_new.json.j2‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
{% if hconfigs['trojan_enable'] and hconfigs['ws_enable'] and hconfigs['h2_enable'] %}
3-
"inbounds": [
4-
{
5-
"tag": "h2-trojan-xhttp-new",
6-
//"listen": "@@trojan-ws-new", //trojan+xhttp listener process
7-
"listen": "/opt/hiddify-manager/xray/run/trojanw.sock,666",
8-
"protocol": "trojan",
9-
"settings": {
10-
"clients": [
11-
{% for u in users %}
12-
{"password": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"} {% if not loop.last %},{% endif %}
13-
{% endfor %}
14-
]
15-
},
16-
"streamSettings": {
17-
"network": "xhttp",
18-
"security": "none",
19-
"xhttpSettings": {
20-
"mode": "stream-up",
21-
"path": "/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_ws'] }}"
22-
}
23-
},
24-
"sniffing": {
25-
"enabled": true,
26-
"destOverride": ["http", "tls", "quic"]
27-
}
28-
}
29-
]
30-
{% endif %}
2+
{% if hconfigs['trojan_enable'] and hconfigs['ws_enable'] and hconfigs['h2_enable'] %}
3+
"inbounds": [
4+
{
5+
"tag":"h2-trojan-ws-new",
6+
//"listen": "@@trojan-ws-new", //trojan+ws listener process
7+
"listen": "/opt/hiddify-manager/xray/run/trojanw.sock,666",
8+
"protocol": "trojan",
9+
"settings": {
10+
"clients": [
11+
{% for u in users %}
12+
{"password": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"},
13+
{% endfor %}
14+
]
15+
},
16+
"streamSettings": {
17+
"network": "ws",
18+
"security": "none",
19+
"wsSettings": {
20+
//"acceptProxyProtocol": true,
21+
"path": "/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_ws'] }}",
22+
}
23+
},
24+
"sniffing": {
25+
"enabled": true,
26+
"destOverride": ["http","tls", "quic"]
27+
}
28+
}
29+
]
30+
{% endif %}
3131
}

‎xray/configs/05_inbounds_h2_trojan_ws_proxy.json.j2‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
11
{
2-
{% if hconfigs['trojan_enable'] and hconfigs['ws_enable'] and hconfigs['h2_enable'] %}
3-
"inbounds": [
4-
{
5-
"tag": "h2-trojan-xhttp-new-proxy",
6-
"listen": "@@trojan-ws-new-h2", //trojan+xhttp listener process
7-
//"listen": "/opt/hiddify-manager/xray/run/trojanw.sock,666",
8-
"protocol": "trojan",
9-
"settings": {
10-
"clients": [
11-
{% for u in users %}
12-
{"password": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"} {% if not loop.last %},{% endif %}
13-
{% endfor %}
14-
]
15-
},
16-
"streamSettings": {
17-
"network": "xhttp",
18-
"security": "none",
19-
"xhttpSettings": {
20-
"mode": "stream-up",
21-
"path": "/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_ws'] }}"
22-
},
23-
"tcpSettings": {
24-
"acceptProxyProtocol": true
25-
}
26-
},
27-
"sniffing": {
28-
"enabled": true,
29-
"destOverride": ["http", "tls", "quic"]
30-
}
31-
}
32-
]
33-
{% endif %}
2+
{% if hconfigs['trojan_enable'] and hconfigs['ws_enable'] and hconfigs['h2_enable'] %}
3+
"inbounds": [
4+
{
5+
"tag":"h2-trojan-ws-new-proxy",
6+
"listen": "@@trojan-ws-new-h2", //trojan+ws listener process
7+
//"listen": "/opt/hiddify-manager/xray/run/trojanw.sock,666",
8+
"protocol": "trojan",
9+
"settings": {
10+
"clients": [
11+
{% for u in users %}
12+
{"password": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"},
13+
{% endfor %}
14+
]
15+
},
16+
"streamSettings": {
17+
"network": "ws",
18+
"security": "none",
19+
"wsSettings": {
20+
"acceptProxyProtocol": true,
21+
"path": "/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_ws'] }}",
22+
}
23+
},
24+
"sniffing": {
25+
"enabled": true,
26+
"destOverride": ["http","tls", "quic"]
27+
}
28+
}
29+
]
30+
{% endif %}
3431
}

‎xray/configs/05_inbounds_h2_vless_grpc_new.json.j2‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
{
2-
{% if hconfigs['vless_enable'] and hconfigs['grpc_enable'] and hconfigs['h2_enable'] %}
3-
"inbounds": [
4-
{
5-
"tag": "h2-vless-xhttp-new",
6-
//"listen": "@@vless-grpc-new", // listen on localhost
7-
"listen": "/opt/hiddify-manager/xray/run/vlessg.sock,666",
8-
"protocol": "vless",
9-
"settings": {
10-
"clients": [
11-
{% for u in users %}
12-
{"id": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"} {% if not loop.last %},{% endif %}
13-
{% endfor %}
14-
],
15-
"decryption": "none"
16-
},
17-
"streamSettings": {
18-
"network": "xhttp",
19-
"security": "none",
20-
"xhttpSettings": {
21-
"mode": "stream-up",
22-
"path": "{{ hconfigs['path_vless'] }}{{ hconfigs['path_grpc'] }}"
23-
}
24-
}
25-
}
26-
]
27-
{% endif %}
2+
{% if hconfigs['vless_enable'] and hconfigs['grpc_enable'] and hconfigs['h2_enable'] %}
3+
"inbounds": [
4+
{
5+
"tag": "h2-vless-grpc-new",
6+
//"listen": "@@vless-grpc-new", // listen on localhost
7+
"listen": "/opt/hiddify-manager/xray/run/vlessg.sock,666",
8+
"protocol": "vless",
9+
"settings": {
10+
"clients": [
11+
{% for u in users %}
12+
{"id": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"},
13+
{% endfor %}
14+
],
15+
"decryption": "none"
16+
},
17+
"streamSettings": {
18+
"network": "grpc",
19+
"security": "none",
20+
"grpcSettings": {
21+
"serviceName": "{{ hconfigs['path_vless'] }}{{ hconfigs['path_grpc'] }}",
22+
}
23+
}
24+
}
25+
]
26+
{% endif %}
2827
}

0 commit comments

Comments
 (0)