From a0565ab0dceab66719f22381a56c4f820b161426 Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Sun, 15 Dec 2024 18:59:56 +0330 Subject: [PATCH] remove useless configs --- haproxy/common.cfg.pj2 | 3 - haproxy/common_not_working_map.cfg.pj2 | 3 - haproxy/dispatcher.cfg.pj2 | 4 -- xray/configs/05_inbounds_02_decoy.json.j2 | 60 ------------------- xray/configs/05_inbounds_02_quic_main.json.j2 | 47 --------------- 5 files changed, 117 deletions(-) delete mode 100644 xray/configs/05_inbounds_02_decoy.json.j2 delete mode 100644 xray/configs/05_inbounds_02_quic_main.json.j2 diff --git a/haproxy/common.cfg.pj2 b/haproxy/common.cfg.pj2 index d38a66bb2..77ef9de00 100644 --- a/haproxy/common.cfg.pj2 +++ b/haproxy/common.cfg.pj2 @@ -226,9 +226,6 @@ backend nginx_dispatcher_http_h2 -backend decoy - server xraydecoy abns@xtlsindecoy send-proxy-v2 - backend tgdecoy server tgdecoy {{hconfigs['telegram_fakedomain']}} diff --git a/haproxy/common_not_working_map.cfg.pj2 b/haproxy/common_not_working_map.cfg.pj2 index 7c33eac89..c5578a68d 100644 --- a/haproxy/common_not_working_map.cfg.pj2 +++ b/haproxy/common_not_working_map.cfg.pj2 @@ -199,9 +199,6 @@ backend nginx_dispatcher_http -backend decoy - server xraydecoy abns@xtlsindecoy send-proxy-v2 - backend tgdecoy server tgdecoy {{hconfigs['telegram_fakedomain']}} diff --git a/haproxy/dispatcher.cfg.pj2 b/haproxy/dispatcher.cfg.pj2 index 4051f9ccb..6860aa013 100644 --- a/haproxy/dispatcher.cfg.pj2 +++ b/haproxy/dispatcher.cfg.pj2 @@ -200,10 +200,6 @@ backend nginx_dispatcher_http - -backend decoy - server xraydecoy abns@xtlsindecoy send-proxy-v2 - backend tgdecoy server tgdecoy {{hconfigs['telegram_fakedomain']}} diff --git a/xray/configs/05_inbounds_02_decoy.json.j2 b/xray/configs/05_inbounds_02_decoy.json.j2 deleted file mode 100644 index 673cc8577..000000000 --- a/xray/configs/05_inbounds_02_decoy.json.j2 +++ /dev/null @@ -1,60 +0,0 @@ -{ - "inbounds": [ - { - "tag":"decoy", - // "port": 400, // This is TLS entrypoint. This entrypoint does the SSL Termination then routes the request based on the Path or ALPN type. - "listen": "@xtlsindecoy", - "protocol": "vless", - "settings": { - "decryption": "none", - "clients": [ - ], - "fallbacks": [ - { - "alpn": "h2", - "dest": "/opt/hiddify-manager/nginx/run/h2.sock", - "xver": 2 - }, - { - "dest": "/opt/hiddify-manager/nginx/run/h1.sock", - "xver": 2 - } - ] - }, - "streamSettings": { - "network": "tcp", - "tcpSettings": { - //"acceptProxyProtocol": true - }, - "security": "tls", - "tlsSettings": { - "certificates": [ - {%for d in domains if d['need_valid_ssl']%} - {"ocspStapling": 3600, - {% if exec("[ -f /opt/hiddify-manager/ssl/"+d.domain[0:64]+".crt ]&& echo -n 'true' || echo -n 'false'")=='true' %} - "certificateFile": "/opt/hiddify-manager/ssl/{{d.domain[0:64]}}.crt", - "keyFile": "/opt/hiddify-manager/ssl/{{d.domain[0:64]}}.crt.key", - {%else %} - {%set cert=exec("ls /opt/hiddify-manager/ssl/*.crt | tail -1").strip()%} - "certificateFile": "{{cert}}", - "keyFile": "{{cert}}.key", - {%endif%} - - }, - {%endfor%} - ], - "minVersion": "1.2", - "cipherSuites": "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - "alpn": [ - "h2", - "http/1.1" - ] - } - }, - "sniffing": { - "enabled": true, - "destOverride": ["http","tls", "quic"] - } - } - ] -} \ No newline at end of file diff --git a/xray/configs/05_inbounds_02_quic_main.json.j2 b/xray/configs/05_inbounds_02_quic_main.json.j2 deleted file mode 100644 index 876b3d7a4..000000000 --- a/xray/configs/05_inbounds_02_quic_main.json.j2 +++ /dev/null @@ -1,47 +0,0 @@ -{ - {% if 0 and hconfigs['vless_enable'] and hconfigs['quic_enable'] %} - "inbounds": [ - { - "tag": "quic", - "port": 443, - "listen":"127.0.0.1", - "protocol": "vless", - "settings": { - "clients": [ - {% for u in users %} - {"id": "{{ u['uuid'] }}", "email": "{{ u['uuid'] }}@hiddify.com"}, - {% endfor %} - ], - "decryption": "none", - "fallbacks": [ - { - "dest": "@dispatcher", - "xver": 2 - } - ] - }, - "streamSettings": { - "network": "quic", - "quicSettings": {}, - "security": "tls", - "tlsSettings": { - "certificates": [ - {%for d in domains if d['need_valid_ssl']%} - {"ocspStapling": 3600, - {% if exec("[ -f /opt/hiddify-manager/ssl/"+d.domain[0:64]+".crt ]&& echo -n 'true' || echo -n 'false'")=='true' %} - "certificateFile": "/opt/hiddify-manager/ssl/{{d.domain[0:64]}}.crt", - "keyFile": "/opt/hiddify-manager/ssl/{{d.domain[0:64]}}.crt.key", - {%else %} - {%set cert=exec("ls /opt/hiddify-manager/ssl/*.crt | tail -1").strip()%} - "certificateFile": "{{cert}}", - "keyFile": "{{cert}}.key", - {%endif%} - }, - {%endfor%} - ] - } - } - } - ] - {% endif %} -} \ No newline at end of file