diff --git a/config/Caddyfile b/config/Caddyfile index 9985a85..9acffff 100644 --- a/config/Caddyfile +++ b/config/Caddyfile @@ -1,11 +1,5 @@ { order forward_proxy before file_server - servers { - listener_wrappers { - proxy_protocol - tls - } - } } :443 { diff --git a/config/nginx.conf b/config/nginx.conf index 31d5303..e0f0d72 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -17,13 +17,9 @@ http { # Proxy Cache storage - so we can cache the DoH response from the upstream proxy_cache_path /var/cache/nginx/doh_cache levels=1:2 keys_zone=doh_cache:10m; - real_ip_header proxy_protocol; - real_ip_recursive on; - set_real_ip_from 10.10.0.10; - server { - listen 10.10.0.2:80 default_server; - listen 10.10.0.2:443 ssl http2 default_server proxy_protocol; + listen 80 default_server; + listen 443 ssl http2 default_server; ssl_certificate /certs/self_public; ssl_certificate_key /certs/self_private; @@ -75,12 +71,11 @@ http { #-domain # server { - # listen 10.10.0.2:80; + # listen 80; # server_name ; #-domain #-ssl - # listen 10.10.0.2:443 ssl http2 proxy_protocol; - # listen 10.10.1.2:443 ssl http2; + # listen 443 ssl http2; # ssl_certificate /certs/cert_public; # ssl_certificate_key /certs/cert_private; #-ssl diff --git a/config/ocserv.conf b/config/ocserv.conf index edf822b..6d5e403 100644 --- a/config/ocserv.conf +++ b/config/ocserv.conf @@ -203,7 +203,7 @@ max-same-clients = 2 # the TCP or UNIX socket (not the UDP one). Although both v1 # and v2 versions of proxy protocol are supported, the v2 version # is recommended as it is more efficient in parsing. -listen-proxy-proto = true +listen-proxy-proto = false # Rate limit the number of incoming connections to one every X milliseconds # (X is the provided value), as the secmod backlog grows. This diff --git a/config/singbox.json b/config/singbox.json index 1500b6d..21b0e5d 100644 --- a/config/singbox.json +++ b/config/singbox.json @@ -3,6 +3,7 @@ { "type": "vless", "tag": "vless", + "listen": "0.0.0.0", "listen_port": 443, "sniff": true, "sniff_override_destination": false, diff --git a/config/upstream.conf b/config/upstream.conf index 968fb3b..57a41da 100644 --- a/config/upstream.conf +++ b/config/upstream.conf @@ -46,14 +46,12 @@ stream { server { listen 443 reuseport; proxy_pass $sni_name; - proxy_protocol on; ssl_preread on; } server { listen 443 udp; proxy_pass $sni_name; - proxy_protocol on; ssl_preread on; } } diff --git a/docker-compose.yml b/docker-compose.yml index 1c1e727..765766c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,10 +10,6 @@ networks: ipam: config: - subnet: 10.10.0.0/24 - singbox: - ipam: - config: - - subnet: 10.10.1.0/24 volumes: adguard: @@ -89,8 +85,6 @@ services: networks: default: ipv4_address: 10.10.0.2 - singbox: - ipv4_address: 10.10.1.2 logging: *default-logging php: image: mercurykd/vpnbot-php:1.5 @@ -426,8 +420,6 @@ services: networks: default: ipv4_address: 10.10.0.9 - singbox: - ipv4_address: 10.10.1.9 logging: *default-logging oc: image: mercurykd/vpnbot-oc:1.2