[GNUnet-SVN] [taler-deployment] branch master updated: redirect api.taler.net to docs.taler.net

[gnunet]

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

marcello pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new b011661  redirect api.taler.net to docs.taler.net
b011661 is described below

commit b01166104cf512ebd24f856153cb6d80ff2b4210
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Jun 2 16:11:04 2017 +0200

    redirect api.taler.net to docs.taler.net
---
 etc/nginx/sites-enabled/api-ssl.site  | 16 +++-------------
 etc/nginx/sites-enabled/api.site      |  5 +++--
 etc/nginx/sites-enabled/docs-ssl.site |  7 ++++---
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/etc/nginx/sites-enabled/api-ssl.site 
b/etc/nginx/sites-enabled/api-ssl.site
index 1b8d53b..1aaf2d9 100644
--- a/etc/nginx/sites-enabled/api-ssl.site
+++ b/etc/nginx/sites-enabled/api-ssl.site
@@ -3,17 +3,7 @@ server {
        listen   [::]:443 ssl; ## listen for ipv4; this line is default and 
implied
        #       listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
-       root /var/www/api.taler.net/api/_build;
-
-       # Make site accessible from http://localhost/
-       server_name api.taler.net;
-       server_name www.api.taler.net;
-
-        include conf.d/talerssl;
-
-       location / {
-           autoindex off;
-       }
-
-        include conf.d/favicon_robots;
+       server_name api.taler.net
+                   www.api.taler.net;
+        redirect ^ https://docs.taler.net$request_uri? permanent;
 }
diff --git a/etc/nginx/sites-enabled/api.site b/etc/nginx/sites-enabled/api.site
index a42dade..21e7efe 100644
--- a/etc/nginx/sites-enabled/api.site
+++ b/etc/nginx/sites-enabled/api.site
@@ -1,7 +1,8 @@
 server {
   listen 80;
   listen [::]:80;
-  server_name api.taler.net;
+  server_name api.taler.net
+              www.api.taler.net;
 
-  rewrite ^ https://$host$request_uri? permanent;
+  rewrite ^ https://docs.taler.net$request_uri? permanent;
 }
diff --git a/etc/nginx/sites-enabled/docs-ssl.site 
b/etc/nginx/sites-enabled/docs-ssl.site
index f070220..ca59800 100644
--- a/etc/nginx/sites-enabled/docs-ssl.site
+++ b/etc/nginx/sites-enabled/docs-ssl.site
@@ -3,11 +3,12 @@ server {
         listen   [::]:443 ssl; ## listen for ipv4; this line is default and 
implied
        #       listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
-       root /var/www/docs.taler.net/docs/_build/;
+        # Temporary, as this is doesn't do i18n
+       root /home/docbuilder/landing/docs/index.html;
 
        # Make site accessible from http://localhost/
-       server_name docs.taler.net;
-       server_name www.docs.taler.net;
+       server_name docs.taler.net
+                   www.docs.taler.net;
 
         include conf.d/talerssl;
 

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