diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-03-10 14:04:16 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-03-10 14:04:16 +0100 |
| commit | 383ae29bc23875addbadcba53fe92c5a978c8018 (patch) | |
| tree | e6dc3b1908f641d755fbd0512e31560798851d52 /etc | |
| parent | 50243b7a3cda27cda73120f0da15e6b0ae1e3e30 (diff) | |
| download | deployment-383ae29bc23875addbadcba53fe92c5a978c8018.tar.gz deployment-383ae29bc23875addbadcba53fe92c5a978c8018.tar.bz2 deployment-383ae29bc23875addbadcba53fe92c5a978c8018.zip | |
including redirects from blog-test*
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/nginx/sites-enabled/blog-test-ssl.site | 3 | ||||
| -rw-r--r-- | etc/nginx/sites-enabled/blog-test.site | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/etc/nginx/sites-enabled/blog-test-ssl.site b/etc/nginx/sites-enabled/blog-test-ssl.site index c3d84f2..ed9739f 100644 --- a/etc/nginx/sites-enabled/blog-test-ssl.site +++ b/etc/nginx/sites-enabled/blog-test-ssl.site @@ -3,7 +3,7 @@ server { # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 server_name blog.test.taler.net; - + ssi on; root /home/test/merchant/examples/blog/; index index.html; @@ -46,4 +46,5 @@ server { proxy_redirect off; proxy_set_header Host $host; } + include conf.d/test.redirects; } diff --git a/etc/nginx/sites-enabled/blog-test.site b/etc/nginx/sites-enabled/blog-test.site index d199361..99a1e21 100644 --- a/etc/nginx/sites-enabled/blog-test.site +++ b/etc/nginx/sites-enabled/blog-test.site @@ -41,9 +41,5 @@ server { proxy_redirect off; proxy_set_header Host $host; } - rewrite ^/shop$ $scheme://shop.test.taler.net/ redirect; - rewrite ^/landing$ $scheme://test.taler.net/ redirect; - rewrite ^/bank$ $scheme://bank.test.taler.net/ redirect; - rewrite ^/mint$ $scheme://mint.demo.taler.net/ redirect; - rewrite ^/mint/(.*)$ $scheme://mint.demo.taler.net/$1 redirect; + include conf.d/test.redirects; } |