summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-03-15 13:15:45 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-03-15 13:15:45 +0100
commit6ce18cfe1ee9df629b0d23869c922d6849f34d16 (patch)
treecfeff581842e3875e3d00bb5e4d4c4151dabb7d1
parentc114c0362ace862b40248e4f1ad979064ac77214 (diff)
downloaddeployment-6ce18cfe1ee9df629b0d23869c922d6849f34d16.tar.gz
deployment-6ce18cfe1ee9df629b0d23869c922d6849f34d16.tar.bz2
deployment-6ce18cfe1ee9df629b0d23869c922d6849f34d16.zip
redirects
-rw-r--r--etc/nginx/sites-enabled/demo.site3
-rw-r--r--etc/nginx/sites-enabled/test.site3
2 files changed, 4 insertions, 2 deletions
diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site
index 9e146a5..680db84 100644
--- a/etc/nginx/sites-enabled/demo.site
+++ b/etc/nginx/sites-enabled/demo.site
@@ -18,7 +18,8 @@ server {
include conf.d/demo.redirects;
include conf.d/talerssl;
location / {
- rewrite ^/$ /en redirect;
+ rewrite ^/$ /en/ redirect;
+ rewrite ^/(..)/$ /$1/index.html break;
uwsgi_pass unix:/home/demo/sockets/landing.uwsgi;
include /etc/nginx/uwsgi_params;
}
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site
index 4afaf79..fe488c9 100644
--- a/etc/nginx/sites-enabled/test.site
+++ b/etc/nginx/sites-enabled/test.site
@@ -32,7 +32,8 @@ server {
# https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
error_page 418 = @blue;
error_page 419 = @green;
- rewrite ^/$ /en redirect;
+ rewrite ^/$ /en/ redirect;
+ rewrite ^/(..)/$ /$1/index.html break;
recursive_error_pages on;
if ($http_x_taler_deployment_color ~ "blue") { return 418; }
if ($http_x_taler_deployment_color ~ "green") { return 419; }