[GNUnet-SVN] [taler-deployment] branch master updated: use proper directory for docs.taler.net and add script for building tutorials.

[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 815135d  use proper directory for docs.taler.net and add script for 
building tutorials.
815135d is described below

commit 815135d57890ab5bd6d9d9a88746e4fc0b01c786
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Mar 30 02:03:44 2017 +0200

    use proper directory for docs.taler.net and add
    script for building tutorials.
---
 etc/nginx/sites-enabled/docs-ssl.site |  2 +-
 etc/nginx/sites-enabled/docs.site     | 19 -------------------
 taler-build/update_docs.sh            | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/etc/nginx/sites-enabled/docs-ssl.site 
b/etc/nginx/sites-enabled/docs-ssl.site
index 9cda1a4..f070220 100644
--- a/etc/nginx/sites-enabled/docs-ssl.site
+++ b/etc/nginx/sites-enabled/docs-ssl.site
@@ -3,7 +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/docs/_build/;
+       root /var/www/docs.taler.net/docs/_build/;
 
        # Make site accessible from http://localhost/
        server_name docs.taler.net;
diff --git a/etc/nginx/sites-enabled/docs.site 
b/etc/nginx/sites-enabled/docs.site
deleted file mode 100644
index 2d72353..0000000
--- a/etc/nginx/sites-enabled/docs.site
+++ /dev/null
@@ -1,19 +0,0 @@
-server {
-        listen 80;
-        listen   [::]:80; ## listen for ipv4; this line is default and implied
-       #       listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
-
-       root /var/www/technical_documentation/docs/_build/;
-
-       # Make site accessible from http://localhost/
-       server_name docs.taler.net;
-       server_name www.docs.taler.net;
-
-       location / {
-           autoindex off;
-           ssi off;
-#          ssi_last_modified on;
-       }
-
-        include conf.d/favicon_robots;
-}
diff --git a/taler-build/update_docs.sh b/taler-build/update_docs.sh
new file mode 100755
index 0000000..54caafa
--- /dev/null
+++ b/taler-build/update_docs.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -eu
+
+for i in merchant/doc merchant-frontend-examples; do
+  cd /var/www/$i
+  git clean -fdx
+  git fetch
+  # reset to updated upstream branch, but only if we're tracking a branch
+  branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || 
echo HEAD)
+  git reset --hard "$branch"
+
+  make
+done

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