From f0d6a11ca1f99431c89b644a43acee75d7ed8285 Mon Sep 17 00:00:00 2001 From: Daoud Clarke Date: Sun, 15 Oct 2023 16:21:49 +0100 Subject: [PATCH] Reenable --- nginx.conf.sigil | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nginx.conf.sigil b/nginx.conf.sigil index b1af7b8..4c2d502 100644 --- a/nginx.conf.sigil +++ b/nginx.conf.sigil @@ -5,18 +5,18 @@ {{ $upstream_port := index $port_map_list 2 }} {{ if eq $scheme "http" }} -#server { -# listen [{{ $.NGINX_BIND_ADDRESS_IP6 }}]:{{ $listen_port }}; -# listen {{ if $.NGINX_BIND_ADDRESS_IP4 }}{{ $.NGINX_BIND_ADDRESS_IP4 }}:{{end}}{{ $listen_port }}; -# {{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }} -# access_log {{ $.NGINX_ACCESS_LOG_PATH }}{{ if and ($.NGINX_ACCESS_LOG_FORMAT) (ne $.NGINX_ACCESS_LOG_PATH "off") }} {{ $.NGINX_ACCESS_LOG_FORMAT }}{{ end }}; -# error_log {{ $.NGINX_ERROR_LOG_PATH }}; -# -# include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; -# location / { -# return 301 https://$host:{{ $.PROXY_SSL_PORT }}$request_uri; -# } -#} +server { + listen [{{ $.NGINX_BIND_ADDRESS_IP6 }}]:{{ $listen_port }}; + listen {{ if $.NGINX_BIND_ADDRESS_IP4 }}{{ $.NGINX_BIND_ADDRESS_IP4 }}:{{end}}{{ $listen_port }}; + {{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }} + access_log {{ $.NGINX_ACCESS_LOG_PATH }}{{ if and ($.NGINX_ACCESS_LOG_FORMAT) (ne $.NGINX_ACCESS_LOG_PATH "off") }} {{ $.NGINX_ACCESS_LOG_FORMAT }}{{ end }}; + error_log {{ $.NGINX_ERROR_LOG_PATH }}; + + include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf; + location / { + return 301 https://$host:{{ $.PROXY_SSL_PORT }}$request_uri; + } +} {{ else if eq $scheme "https"}} server { listen [{{ $.NGINX_BIND_ADDRESS_IP6 }}]:{{ $listen_port }} ssl {{ if eq $.HTTP2_SUPPORTED "true" }}http2{{ else if eq $.SPDY_SUPPORTED "true" }}spdy{{ end }};