From b1f765bf0b23bb33478a36e963ae78999fde079f Mon Sep 17 00:00:00 2001 From: Jeffery CHEN Fan Date: Fri, 16 Sep 2022 10:09:44 +0800 Subject: [PATCH] Update nginx-template.conf variable @webserver should been defined before been referenced. --- images/nginx/nginx-template.conf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/images/nginx/nginx-template.conf b/images/nginx/nginx-template.conf index 9ce62e7b..52e78942 100644 --- a/images/nginx/nginx-template.conf +++ b/images/nginx/nginx-template.conf @@ -52,7 +52,19 @@ server { proxy_pass http://socketio-server; } + + location @webserver { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; + proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER}; + proxy_set_header Host $host; + proxy_set_header X-Use-X-Accel-Redirect True; + proxy_read_timeout 120; + proxy_redirect off; + proxy_pass http://backend-server; + } + location / { rewrite ^(.+)/$ $proxy_x_forwarded_proto://$http_host$1 permanent; rewrite ^(.+)/index\.html$ $proxy_x_forwarded_proto://$http_host$1 permanent; @@ -66,18 +78,6 @@ server { try_files /sites/${FRAPPE_SITE_NAME_HEADER}/public/$uri @webserver; } - location @webserver { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto; - proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER}; - proxy_set_header Host $host; - proxy_set_header X-Use-X-Accel-Redirect True; - proxy_read_timeout 120; - proxy_redirect off; - - proxy_pass http://backend-server; - } - # error pages error_page 502 /502.html; location /502.html {