[GNUnet-SVN] [taler-deployment] branch master updated (5b037b1 -> a0267cf)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository deployment.

    from 5b037b1  log level
     new dfa6dbf  cert for backend
     new a0267cf  Don't use Lua for language redirect

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 etc/nginx/sites-enabled/www-ssl.site   | 34 +++++++---------------------------
 etc/nginx/sites-enabled/www-stage.site | 34 +++++++---------------------------
 taler.net/renew-certs.sh               |  2 ++
 3 files changed, 16 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;
 
diff --git a/taler.net/renew-certs.sh b/taler.net/renew-certs.sh
index 2cf7c5b..b02929f 100755
--- a/taler.net/renew-certs.sh
+++ b/taler.net/renew-certs.sh
@@ -22,6 +22,8 @@ certbot certonly \
   -d survey.test.taler.net \
   -d survey.demo.taler.net \
   -d donations.demo.taler.net \
+  -d backend.test.taler.net \
+  -d backend.demo.taler.net \
   -d bank.test.taler.net \
   -d bank.demo.taler.net \
   -d www.git.taler.net \

-- 
To stop receiving notification emails like this one, please contact
address@hidden