From b042948973cd03c4e8b51e6bcfa08dea1fd1f6c7 Mon Sep 17 00:00:00 2001 From: Guillaume Vincent Date: Sat, 15 Oct 2016 13:12:42 +0200 Subject: [PATCH] try to fix admin redirect loop with ssl --- backend.conf.j2 | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/backend.conf.j2 b/backend.conf.j2 index 4dbcee1..6309d42 100644 --- a/backend.conf.j2 +++ b/backend.conf.j2 @@ -1,6 +1,7 @@ server { + listen 80; {% if domain %} - server_name {{ domain }}; + server_name {{ domain }} www.{{ domain }}; {% else %} server_name localhost; {% endif %} @@ -42,20 +43,32 @@ server { resolver 8.8.8.8 8.8.4.4 208.67.222.222 208.67.220.220 valid=300s; {% endif %} - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; location / { proxy_pass http://frontend:8080; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Real-IP $remote_addr; + proxy_redirect off; } location /admin/ { proxy_pass http://backend:8000; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Real-IP $remote_addr; + proxy_redirect off; } location /api/ { proxy_pass http://backend:8000; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Real-IP $remote_addr; + proxy_redirect off; } location /static/ {