diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-11-22 14:28:31 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-11-22 14:28:31 +0100 |
commit | ce8a4e1f9f6edb518d0bf06b6c6ad0429ab3e34b (patch) | |
tree | 055eced9eef48b265af9f91cb5f01f77c31ae73f /etc/nginx/sites-enabled/test.site | |
parent | 8527a86a83415789a6f6ece66f3d82eb0624b4f9 (diff) | |
download | deployment-ce8a4e1f9f6edb518d0bf06b6c6ad0429ab3e34b.tar.gz deployment-ce8a4e1f9f6edb518d0bf06b6c6ad0429ab3e34b.tar.bz2 deployment-ce8a4e1f9f6edb518d0bf06b6c6ad0429ab3e34b.zip |
test redirects
Diffstat (limited to 'etc/nginx/sites-enabled/test.site')
-rw-r--r-- | etc/nginx/sites-enabled/test.site | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site index 8d45458..62452ab 100644 --- a/etc/nginx/sites-enabled/test.site +++ b/etc/nginx/sites-enabled/test.site @@ -17,8 +17,9 @@ server { rewrite /javascript /javascript.html break; include conf.d/test.redirects; include conf.d/talerssl; - rewrite ^.*/redir_app_rel/(.*) /$1 redirect; location / { + # SSI is okay here, since we only serve static content + # from landing ssi on; uwsgi_pass unix:/home/test/sockets/landing.uwsgi; include /etc/nginx/uwsgi_params; @@ -58,7 +59,6 @@ server { location / { ssi on; - set $envroot "/"; uwsgi_pass unix:/home/test/sockets/shop.uwsgi; include /etc/nginx/uwsgi_params; } @@ -72,13 +72,13 @@ server { include conf.d/favicon_robots; } + server { listen 443 ssl; listen 80; listen [::]:443 ssl; listen [::]:80; server_name backend.test.taler.net; - include conf.d/test.redirects; include conf.d/talerssl; location / { @@ -88,6 +88,7 @@ server { } } + server { listen 443 ssl; listen [::]:443 ssl; @@ -97,12 +98,10 @@ server { location / { ssi on; - set $envroot "/"; uwsgi_pass unix:/home/test/sockets/donations.uwsgi; include /etc/nginx/uwsgi_params; } - location /backend { rewrite /backend/(.*) /$1 break; proxy_pass http://unix:/home/test/sockets/merchant.http:/; @@ -127,7 +126,6 @@ server { location / { ssi on; - set $envroot "/"; uwsgi_pass unix:/home/test/sockets/bank.uwsgi; include /etc/nginx/uwsgi_params; } |