Merge 7eff7a54363bc99301790d6a871b0745d0304177 into 25a26d6175fb324831a330fb76772a7d72e36965

This commit is contained in:
Charles Wilkinson 2024-10-31 11:31:22 +01:00 committed by GitHub
commit 4afc8500d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3,35 +3,37 @@
# ------------------------------------------------------------ # ------------------------------------------------------------
{% if enabled %} {% if enabled %}
{% if tcp_forwarding == 1 or tcp_forwarding == true -%} set $forwarding_host {{ forwarding_host }};
server { set $forwarding_port {{ forwarding_port }};
listen {{ incoming_port }}; {% if tcp_forwarding == 1 or tcp_forwarding == true -%}
{% if ipv6 -%} server {
listen [::]:{{ incoming_port }}; listen {{ incoming_port }};
{% else -%} {% if ipv6 -%}
#listen [::]:{{ incoming_port }}; listen [::]:{{ incoming_port }};
{% endif %} {% else -%}
#listen [::]:{{ incoming_port }};
{% endif %}
proxy_pass {{ forwarding_host }}:{{ forwarding_port }}; proxy_pass $forwarding_host:$forwarding_port;
# Custom # Custom
include /data/nginx/custom/server_stream[.]conf; include /data/nginx/custom/server_stream[.]conf;
include /data/nginx/custom/server_stream_tcp[.]conf; include /data/nginx/custom/server_stream_tcp[.]conf;
} }
{% endif %} {% endif %}
{% if udp_forwarding == 1 or udp_forwarding == true %} {% if udp_forwarding == 1 or udp_forwarding == true %}
server { server {
listen {{ incoming_port }} udp; listen {{ incoming_port }} udp;
{% if ipv6 -%} {% if ipv6 -%}
listen [::]:{{ incoming_port }} udp; listen [::]:{{ incoming_port }} udp;
{% else -%} {% else -%}
#listen [::]:{{ incoming_port }} udp; #listen [::]:{{ incoming_port }} udp;
{% endif %} {% endif %}
proxy_pass {{ forwarding_host }}:{{ forwarding_port }}; proxy_pass $forwarding_host:$forwarding_port;
# Custom # Custom
include /data/nginx/custom/server_stream[.]conf; include /data/nginx/custom/server_stream[.]conf;
include /data/nginx/custom/server_stream_udp[.]conf; include /data/nginx/custom/server_stream_udp[.]conf;
} }
{% endif %} {% endif %}
{% endif %} {% endif %}