diff options
| author | Florian Dold <florian.dold@gmail.com> | 2017-12-16 21:09:08 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2017-12-16 21:09:08 +0100 |
| commit | a0267cfb2d3be72cd6fa310c8f66db6df70de976 (patch) | |
| tree | 2c0641238a6b1f6e765d302444964ba55a8eb432 /etc/nginx | |
| parent | dfa6dbfd940152f2f606c037886ccc042c8676ba (diff) | |
| download | deployment-a0267cfb2d3be72cd6fa310c8f66db6df70de976.tar.gz deployment-a0267cfb2d3be72cd6fa310c8f66db6df70de976.tar.bz2 deployment-a0267cfb2d3be72cd6fa310c8f66db6df70de976.zip | |
Don't use Lua for language redirect
For some reason Lua doesn't work anymore on taler.net
Using Lua for this is not required, the config from this
commit has the same functionality.
Diffstat (limited to 'etc/nginx')
| -rw-r--r-- | etc/nginx/sites-enabled/www-ssl.site | 34 | ||||
| -rw-r--r-- | etc/nginx/sites-enabled/www-stage.site | 34 |
2 files changed, 14 insertions, 54 deletions
diff --git a/etc/nginx/sites-enabled/www-ssl.site b/etc/nginx/sites-enabled/www-ssl.site index d83d19c..47a01a9 100644 --- a/etc/nginx/sites-enabled/www-ssl.site +++ b/etc/nginx/sites-enabled/www-ssl.site @@ -9,32 +9,12 @@ server { server_name www.taler.net; include conf.d/talerssl; - location = / { - rewrite_by_lua ' - if ngx.var.http_accept_language == nil then - ngx.redirect("/en/") - end - - for lang in (ngx.var.http_accept_language .. ","):gmatch("([^,]*),") do - if string.sub(lang, 0, 2) == "en" then - ngx.redirect("/en/") - end - if string.sub(lang, 0, 2) == "de" then - ngx.redirect("/de/") - end - if string.sub(lang, 0, 2) == "fr" then - ngx.redirect("/fr/") - end - if string.sub(lang, 0, 2) == "it" then - ngx.redirect("/it/") - end - if string.sub(lang, 0, 2) == "es" then - ngx.redirect("/es/") - end - end - - ngx.redirect("/en/") - '; + map $http_accept_language $index_redirect_uri { + default "/en/"; + ~en "/en/"; + ~de "/de/"; + ~fr "/fr/"; + ~es "/it/"; } location / { @@ -43,7 +23,7 @@ server { ssi on; #ssi_last_modified on; - rewrite ^/$ /en/ redirect; + rewrite ^/$ /$index_redirect_uri/ redirect; rewrite ^/(..)/$ /$1/index.html break; diff --git a/etc/nginx/sites-enabled/www-stage.site b/etc/nginx/sites-enabled/www-stage.site index bd7b760..6a15495 100644 --- a/etc/nginx/sites-enabled/www-stage.site +++ b/etc/nginx/sites-enabled/www-stage.site @@ -21,39 +21,19 @@ server { server_name stage.taler.net; include conf.d/talerssl; - location = / { - rewrite_by_lua ' - if ngx.var.http_accept_language == nil then - ngx.redirect("/en/") - end - - for lang in (ngx.var.http_accept_language .. ","):gmatch("([^,]*),") do - if string.sub(lang, 0, 2) == "en" then - ngx.redirect("/en/") - end - if string.sub(lang, 0, 2) == "de" then - ngx.redirect("/de/") - end - if string.sub(lang, 0, 2) == "fr" then - ngx.redirect("/fr/") - end - if string.sub(lang, 0, 2) == "it" then - ngx.redirect("/it/") - end - if string.sub(lang, 0, 2) == "es" then - ngx.redirect("/es/") - end - end - - ngx.redirect("/en/") - '; + map $http_accept_language $index_redirect_uri { + default "/en/"; + ~en "/en/"; + ~de "/de/"; + ~fr "/fr/"; + ~es "/it/"; } location / { root /home/docbuilder/stage.taler.net; autoindex off; - rewrite ^/$ /en/ redirect; + rewrite ^/$ /$index_redirect_uri/ redirect; rewrite ^/(..)/$ /$1/index.html break; |