From 8b63ffcafaaf8384fc8c21ea45e0cad0491e309e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 20 Nov 2016 04:38:30 +0100 Subject: blog->shop for test --- etc/nginx/conf.d/test.redirects | 14 +++++++------- etc/nginx/sites-enabled/test.site | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/etc/nginx/conf.d/test.redirects b/etc/nginx/conf.d/test.redirects index e432ee6..af56520 100644 --- a/etc/nginx/conf.d/test.redirects +++ b/etc/nginx/conf.d/test.redirects @@ -1,7 +1,7 @@ - rewrite ^/shop$ $scheme://shop.test.taler.net/ redirect; - rewrite ^/blog$ $scheme://blog.test.taler.net/ redirect; - rewrite ^/landing$ $scheme://test.taler.net/ redirect; - rewrite ^/bank(.*)$ $scheme://bank.test.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.test.taler.net/track redirect; +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.demo.taler.net/ redirect; +rewrite ^/exchange/(.*)$ $scheme://exchange.demo.taler.net/$1 redirect; +rewrite ^/blog/track$ $scheme://blog.test.taler.net/track redirect; diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site index 67ae5af..ea193cf 100644 --- a/etc/nginx/sites-enabled/test.site +++ b/etc/nginx/sites-enabled/test.site @@ -3,7 +3,6 @@ server { listen [::]:80; server_name test.taler.net bank.test.taler.net - blog.test.taler.net shop.test.taler.net exchange.test.taler.net; rewrite ^ https://$host$request_uri? permanent; @@ -51,7 +50,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - server_name blog.test.taler.net; + server_name shop.test.taler.net; root /dev/null; include conf.d/test.redirects; include conf.d/talerssl; @@ -91,7 +90,7 @@ server { server { listen 443 ssl; listen [::]:443 ssl; - server_name shop.test.taler.net; + server_name donations.test.taler.net; ssi on; include conf.d/test.redirects; include conf.d/talerssl; -- cgit v1.2.3