summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/nginx/sites-enabled/blog-test-ssl.site3
-rw-r--r--etc/nginx/sites-enabled/blog-test.site6
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;
}