[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] branch master updated: remove legacy /ba
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] branch master updated: remove legacy /backend, add X-Forwarded headers |
Date: |
Fri, 05 Jan 2018 16:55:07 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new 16754a7 remove legacy /backend, add X-Forwarded headers
16754a7 is described below
commit 16754a74b03935d4048516fd6a9b1f214137f96a
Author: Florian Dold <address@hidden>
AuthorDate: Fri Jan 5 16:55:02 2018 +0100
remove legacy /backend, add X-Forwarded headers
---
etc/nginx/sites-enabled/test.site | 45 ++++++---------------------------------
1 file changed, 6 insertions(+), 39 deletions(-)
diff --git a/etc/nginx/sites-enabled/test.site
b/etc/nginx/sites-enabled/test.site
index c12c23a..28c9a5d 100644
--- a/etc/nginx/sites-enabled/test.site
+++ b/etc/nginx/sites-enabled/test.site
@@ -148,32 +148,6 @@ server {
include conf.d/test.redirects;
include conf.d/talerssl;
- location @blue {
- add_header X-Taler-Deployment-Color blue;
- uwsgi_pass unix:/home/test-blue/sockets/shop.uwsgi;
- include /etc/nginx/uwsgi_params;
- }
- location @green {
- add_header X-Taler-Deployment-Color green;
- uwsgi_pass unix:/home/test-green/sockets/shop.uwsgi;
- include /etc/nginx/uwsgi_params;
- }
-
- location @blue-backend {
- add_header X-Taler-Deployment-Color blue;
- rewrite /backend/(.*) /$1 break;
- proxy_pass http://unix:/home/test-blue/sockets/merchant.http;
- proxy_redirect off;
- proxy_set_header Host $host;
- }
- location @green-backend {
- add_header X-Taler-Deployment-Color green;
- rewrite /backend/(.*) /$1 break;
- proxy_pass http://unix:/home/test-green/sockets/merchant.http;
- proxy_redirect off;
- proxy_set_header Host $host;
- }
-
location / {
# Redirection technique explainted at
# https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
@@ -186,19 +160,6 @@ server {
include /etc/nginx/uwsgi_params;
}
- location /backend {
- # Redirection technique explainted at
- # https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
- error_page 418 = @blue-backend;
- error_page 419 = @green-backend;
- recursive_error_pages on;
- if ($http_x_taler_deployment_color ~ "blue") { return 418; }
- if ($http_x_taler_deployment_color ~ "green") { return 419; }
- rewrite /backend/(.*) /$1 break;
- proxy_pass http://unix:/home/test/sockets/merchant.http:/;
- proxy_redirect off;
- proxy_set_header Host $host;
- }
include conf.d/favicon_robots;
}
@@ -216,12 +177,16 @@ server {
proxy_pass http://unix:/home/test-blue/sockets/merchant.http;
proxy_redirect off;
proxy_set_header Host $host;
+ proxy_set_header X-Forwarded-Host $proxy_host;
+ proxy_set_header X-Forwarded-Proto "https";
}
location @green {
add_header X-Taler-Deployment-Color green;
proxy_pass http://unix:/home/test-green/sockets/merchant.http;
proxy_redirect off;
proxy_set_header Host $host;
+ proxy_set_header X-Forwarded-Host $proxy_host;
+ proxy_set_header X-Forwarded-Proto "https";
}
location / {
@@ -232,6 +197,8 @@ server {
recursive_error_pages on;
if ($http_x_taler_deployment_color ~ "blue") { return 418; }
if ($http_x_taler_deployment_color ~ "green") { return 419; }
+ proxy_set_header X-Forwarded-Host $proxy_host;
+ proxy_set_header X-Forwarded-Proto "https";
proxy_pass http://unix:/home/test/sockets/merchant.http:/;
proxy_redirect off;
proxy_set_header Host $host;
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-deployment] branch master updated: remove legacy /backend, add X-Forwarded headers,
gnunet <=