From d10b66028bbd143ab7c757ce12e22a629e5dc1b4 Mon Sep 17 00:00:00 2001 From: Carl Mercier Date: Thu, 8 Aug 2019 20:18:50 -0400 Subject: [PATCH] Don't fail if file doesn't exist --- rootfs/etc/nginx/nginx.conf | 4 ++-- src/backend/templates/proxy_host.conf | 2 +- src/backend/templates/redirection_host.conf | 2 +- src/backend/templates/stream.conf | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rootfs/etc/nginx/nginx.conf b/rootfs/etc/nginx/nginx.conf index e5cd23d0..ea45b53f 100644 --- a/rootfs/etc/nginx/nginx.conf +++ b/rootfs/etc/nginx/nginx.conf @@ -78,7 +78,7 @@ http { include /data/nginx/temp/*.conf; # Custom - include /data/nginx/custom/http.conf; + include /data/nginx/custom/http[.]conf; } stream { @@ -87,4 +87,4 @@ stream { } # Custom -include /data/nginx/custom/root.conf; +include /data/nginx/custom/root[.]conf; diff --git a/src/backend/templates/proxy_host.conf b/src/backend/templates/proxy_host.conf index f0a681dd..8d8c97da 100644 --- a/src/backend/templates/proxy_host.conf +++ b/src/backend/templates/proxy_host.conf @@ -42,6 +42,6 @@ server { {% endif %} # Custom - include /data/nginx/custom/server_proxy.conf; + include /data/nginx/custom/server_proxy[.]conf; } {% endif %} diff --git a/src/backend/templates/redirection_host.conf b/src/backend/templates/redirection_host.conf index 10d9fe7c..463f3a8e 100644 --- a/src/backend/templates/redirection_host.conf +++ b/src/backend/templates/redirection_host.conf @@ -26,6 +26,6 @@ server { {% endif %} # Custom - include /data/nginx/custom/server_redirect.conf; + include /data/nginx/custom/server_redirect[.]conf; } {% endif %} diff --git a/src/backend/templates/stream.conf b/src/backend/templates/stream.conf index 7b28c744..a6dc054f 100644 --- a/src/backend/templates/stream.conf +++ b/src/backend/templates/stream.conf @@ -9,8 +9,8 @@ server { proxy_pass {{ forward_ip }}:{{ forwarding_port }}; # Custom - include /data/nginx/custom/server_stream.conf; - include /data/nginx/custom/server_stream_tcp.conf; + include /data/nginx/custom/server_stream[.]conf; + include /data/nginx/custom/server_stream_tcp[.]conf; } {% endif %} {% if udp_forwarding == 1 or udp_forwarding == true %} @@ -19,8 +19,8 @@ server { proxy_pass {{ forward_ip }}:{{ forwarding_port }}; # Custom - include /data/nginx/custom/server_stream.conf; - include /data/nginx/custom/server_stream_udp.conf; + include /data/nginx/custom/server_stream[.]conf; + include /data/nginx/custom/server_stream_udp[.]conf; } {% endif %} {% endif %} \ No newline at end of file