taler-deployment

commit 163856f9fde70daafe17378d9695fa9279e0daf2
parent 51a5bf1ed407ff6074dd07be7c79ca9289433d28
Author: Florian Dold <florian.dold@gmail.com>
Date:   Mon,  5 Feb 2018 13:31:35 +0100

we are not using hacky redirects anymore

Diffstat:
D
etc/nginx/conf.d/demo.redirects
 | 
7
-------
D
etc/nginx/conf.d/test.redirects
 | 
9
---------
M
etc/nginx/sites-enabled/demo.site
 | 
29
-----------------------------
M
etc/nginx/sites-enabled/test.site
 | 
6
------

4 files changed, 0 insertions(+), 51 deletions(-)
diff --git a/etc/nginx/conf.d/demo.redirects b/etc/nginx/conf.d/demo.redirects
@@ -1,7 +0,0 @@
-rewrite ^/shop$ $scheme://shop.demo.taler.net/ redirect;
-rewrite ^/donations$ $scheme://donations.demo.taler.net/ redirect;
-rewrite ^/landing$ $scheme://demo.taler.net/ redirect;
-rewrite ^/bank(.*)$ $scheme://bank.demo.taler.net/$1 redirect;
-rewrite ^/exchange$ $scheme://exchange.demo.taler.net/ redirect;
-rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect;
-rewrite ^/blog/track$ $scheme://blog.demo.taler.net/track redirect;
diff --git a/etc/nginx/conf.d/test.redirects b/etc/nginx/conf.d/test.redirects
@@ -1,9 +0,0 @@
-rewrite ^/shop$ $scheme://shop.test.taler.net/ redirect;
-rewrite ^/donations$ $scheme://donations.test.taler.net/ redirect;
-rewrite ^/landing$ $scheme://test.taler.net/ redirect;
-rewrite ^/bank(.*)$ $scheme://bank.test.taler.net/$1 redirect;
-rewrite ^/exchange$ $scheme://exchange.test.taler.net/ redirect;
-rewrite ^/exchange/(.*)$ $scheme://exchange.test.taler.net/$1 redirect;
-rewrite ^/blog/track$ $scheme://blog.test.taler.net/track redirect;
-# relative redirect that works from anywhere in a URL.
-rewrite ^.*/redir_app_rel/(.*) /$1 redirect;
diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site
@@ -24,7 +24,6 @@ server {
   listen 443 ssl;
   listen [::]:443 ssl;
   server_name auditor.demo.taler.net;
-  include conf.d/demo.redirects;
   include conf.d/talerssl;
   location / {
     rewrite ^/$ /en/ redirect;
@@ -41,7 +40,6 @@ server {
   listen [::]:443 ssl;
   server_name demo.taler.net www.demo.taler.net;
   rewrite /javascript /javascript.html break;
-  include conf.d/demo.redirects;
   include conf.d/talerssl;
   location / {
     rewrite ^/$ /en/ redirect;
@@ -81,7 +79,6 @@ server {
   listen [::]:443 ssl;
   listen [::]:80;
   server_name backend.demo.taler.net;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
 
   location / {
@@ -93,24 +90,9 @@ server {
 
 server {
   listen 443 ssl;
-  listen [::]:443 ssl;
-  server_name shop.demo.taler.net;
-  root /dev/null;
-  include conf.d/demo.redirects;
-  include conf.d/talerssl;
-
-  location / {
-    uwsgi_pass unix:/home/demo/sockets/shop.uwsgi;
     include /etc/nginx/uwsgi_params;
   }
 
-  location /backend {
-    rewrite /backend/(.*) /$1 break;
-    proxy_pass http://unix:/home/demo/sockets/merchant.http:/;
-    proxy_redirect off;
-    proxy_set_header Host $host;
-  }
-
   include conf.d/favicon_robots;
 }
 
@@ -119,7 +101,6 @@ server {
   listen 443 ssl;
   listen [::]:443 ssl;
   server_name donations.demo.taler.net;
-  include conf.d/demo.redirects;
   include conf.d/talerssl;
 
   location / {
@@ -127,14 +108,6 @@ server {
     include /etc/nginx/uwsgi_params;
   }
 
-
-  location /backend {
-    rewrite /backend/(.*) /$1 break;
-    proxy_pass http://unix:/home/demo/sockets/merchant.http:/;
-    proxy_redirect off;
-    proxy_set_header Host $host;
-  }
-
   include conf.d/favicon_robots;
 }
 
@@ -142,7 +115,6 @@ server {
   server_name survey.demo.taler.net;
   listen 443 ssl;
   listen [::]:443 ssl;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
 
   location / {
@@ -155,7 +127,6 @@ server {
   listen 443 ssl;
   listen [::]:443 ssl;
   server_name bank.demo.taler.net;
-  include conf.d/demo.redirects;
   include conf.d/talerssl;
 
   location / {
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site
@@ -23,7 +23,6 @@ server {
   listen 443 ssl;
   listen [::]:443 ssl;
   rewrite /javascript /javascript.html break;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
   location @green {
     add_header X-Taler-Deployment-Color green;
@@ -54,7 +53,6 @@ server {
   listen 443 ssl;
   listen [::]:443 ssl;
   root /dev/null;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
   location @green {
     add_header X-Taler-Deployment-Color green;
@@ -142,7 +140,6 @@ server {
   listen 443 ssl;
   listen [::]:443 ssl;
   root /dev/null;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
 
   location @blue {
@@ -241,7 +238,6 @@ server {
   server_name survey.test.taler.net;
   listen 443 ssl;
   listen [::]:443 ssl;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
 
   location / {
@@ -254,7 +250,6 @@ server {
   server_name donations.test.taler.net;
   listen 443 ssl;
   listen [::]:443 ssl;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
 
   location @blue {
@@ -288,7 +283,6 @@ server {
   server_name bank.test.taler.net;
   listen 443 ssl;
   listen [::]:443 ssl;
-  include conf.d/test.redirects;
   include conf.d/talerssl;
 
   location @blue {