[GNUnet-SVN] [taler-deployment] branch master updated (1853e69 -> 5cf8fba)

[gnunet]

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

marcello pushed a change to branch master
in repository deployment.

    from 1853e69  add survey domains
     new 14f7b04  [frontends]/FRACTION not needed
     new 974f1df  removing any mention of 'merchant-frontends'
     new 5cf8fba  every frontend has its own "update" script

The 3 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:
 bootstrap-bluegreen                                 |  4 ++--
 bootstrap-standalone                                |  4 ++--
 config/generate-config                              |  2 --
 doc/onboarding.texi                                 |  5 +++--
 taler-build/Makefile                                | 12 ++++++++----
 taler-build/invalidate.sh                           |  2 +-
 taler-build/{update_bank.sh => update_blog.sh}      |  4 +++-
 taler-build/{update_bank.sh => update_donations.sh} |  4 +++-
 taler-build/update_merchant_frontends.sh            | 19 -------------------
 taler-build/{update_bank.sh => update_survey.sh}    |  4 +++-
 10 files changed, 25 insertions(+), 35 deletions(-)
 copy taler-build/{update_bank.sh => update_blog.sh} (85%)
 copy taler-build/{update_bank.sh => update_donations.sh} (84%)
 delete mode 100755 taler-build/update_merchant_frontends.sh
 copy taler-build/{update_bank.sh => update_survey.sh} (84%)

diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen
index 77d61ae..fab905c 100755
--- a/bootstrap-bluegreen
+++ b/bootstrap-bluegreen
@@ -54,13 +54,13 @@ if ! test -d $HOME/libmicrohttpd; then
   git clone git://gnunet.org/libmicrohttpd.git
 fi
 
-for component in bank merchant gnurl landing exchange merchant-frontends 
deployment auditor survey ; do
+for component in bank merchant gnurl landing exchange donations blog 
deployment auditor survey ; do
   if ! test -d $HOME/$component; then
     git clone /var/git/$component.git
   fi
 done
 
-for component in bank merchant landing exchange merchant-frontends survey ; do
+for component in bank merchant landing exchange donations blog survey ; do
   echo "Checking out $component to $BRANCH"
   git -C $HOME/$component checkout $BRANCH
 done
diff --git a/bootstrap-standalone b/bootstrap-standalone
index 1bfbc8d..b816852 100755
--- a/bootstrap-standalone
+++ b/bootstrap-standalone
@@ -22,13 +22,13 @@ if ! test -d $HOME/libmicrohttpd; then
   git clone git://gnunet.org/libmicrohttpd.git
 fi
 
-for component in bank merchant gnurl landing exchange merchant-frontends 
deployment survey ; do
+for component in bank merchant gnurl landing exchange donations blog 
deployment survey ; do
   if ! test -d $HOME/$component; then
     git clone /var/git/$component.git
   fi
 done
 
-for component in bank merchant landing exchange merchant-frontends survey ; do
+for component in bank merchant landing exchange donations blog survey ; do
   echo "Checking out $component to $BRANCH"
   git -C $HOME/$component checkout $BRANCH
 done
diff --git a/config/generate-config b/config/generate-config
index 4da3e75..b52e5fd 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -102,8 +102,6 @@ def config(currency, envname, exchange_pub, standalone):
     else:
         cfg_put("frontends", "backend", 
"https://shop.{}.taler.net/backend/".format(envname))
 
-    cfg_put("frontends", "fraction", "100000000")
-
     cfg_put("auditor", "auditor_priv_file", 
"${TALER_DEPLOYMENT_SHARED}/auditor/offline-keys/auditor.priv")
 
     cfg_put("exchange", "base_url", 
"https://exchange.{}.taler.net/".format(envname))
diff --git a/doc/onboarding.texi b/doc/onboarding.texi
index de520ad..c0ba2d9 100644
--- a/doc/onboarding.texi
+++ b/doc/onboarding.texi
@@ -449,7 +449,7 @@ point for others.
 First, make sure that the deployment @emph{AND} the deployment scripts work on 
the @cite{test.taler.net} deployment.
 
 For all repositories that have a separate stable branch (currently 
exchange.git,
-merchant.git, merchant-frontends.git, bank.git, landing.git) do:
+merchant.git, donations.git, blog.git, bank.git, landing.git) do:
 
 @example
 $ cd $REPO
@@ -532,7 +532,8 @@ The following components are published on the GNU mirrors
 @itemize
 @item taler-exchange (exchange.git)
 @item taler-merchant (merchant.git)
address@hidden talerfrontends (merchant-frontends.git)
address@hidden talerdonations (donations.git)
address@hidden talerblog (blog.git)
 @item taler-bank (bank.git)
 @item taler-wallet-webex (wallet-webex.git)
 @end itemize
diff --git a/taler-build/Makefile b/taler-build/Makefile
index 709a671..3d1a0fb 100644
--- a/taler-build/Makefile
+++ b/taler-build/Makefile
@@ -1,4 +1,4 @@
-all: exchange-stamp bank-stamp merchant-stamp gnunet-stamp 
merchant-frontends-stamp landing-stamp deployment-stamp auditor-stamp 
survey-stamp
+all: exchange-stamp bank-stamp merchant-stamp gnunet-stamp donations-stamp 
blog-stamp landing-stamp deployment-stamp auditor-stamp survey-stamp
 
 deployment-stamp:
        ./update_deployment.sh
@@ -37,12 +37,16 @@ libgnurl-stamp: deployment-stamp
        ./update_libgnurl.sh
        touch $@
 
-merchant-frontends-stamp: deployment-stamp
-       ./update_merchant_frontends.sh
+donations-stamp: deployment-stamp
+       ./update_donations.sh
+       touch $@
+
+blog-stamp: deployment-stamp
+       ./update_blog.sh
        touch $@
 
 survey-stamp: deployment-stamp
-       ./update_merchant_survey.sh
+       ./update_survey.sh
        touch $@
 
 lcov: gnunet-stamp deployment-stamp
diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh
index dbff4be..3ea43f1 100755
--- a/taler-build/invalidate.sh
+++ b/taler-build/invalidate.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-for component in deployment exchange merchant bank gnurl merchant-frontends 
landing gnunet libmicrohttpd survey ; do
+for component in deployment exchange merchant bank gnurl donations blog 
landing gnunet libmicrohttpd survey ; do
   cd $HOME/$component
   git fetch
   if git status -sb | grep behind; then
diff --git a/taler-build/update_bank.sh b/taler-build/update_blog.sh
similarity index 85%
copy from taler-build/update_bank.sh
copy to taler-build/update_blog.sh
index 42ea74a..44c8fca 100755
--- a/taler-build/update_bank.sh
+++ b/taler-build/update_blog.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-cd $HOME/bank
+cd $HOME/blog/
 git clean -fxd
 
 git fetch
@@ -10,6 +10,8 @@ git fetch
 branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || 
echo HEAD)
 git reset --hard "$branch"
 
+git submodule update --init --force
+
 ./bootstrap
 ./configure --prefix="$HOME/local"
 make install check
diff --git a/taler-build/update_bank.sh b/taler-build/update_donations.sh
similarity index 84%
copy from taler-build/update_bank.sh
copy to taler-build/update_donations.sh
index 42ea74a..0551159 100755
--- a/taler-build/update_bank.sh
+++ b/taler-build/update_donations.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-cd $HOME/bank
+cd $HOME/donations/
 git clean -fxd
 
 git fetch
@@ -10,6 +10,8 @@ git fetch
 branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || 
echo HEAD)
 git reset --hard "$branch"
 
+git submodule update --init --force
+
 ./bootstrap
 ./configure --prefix="$HOME/local"
 make install check
diff --git a/taler-build/update_merchant_frontends.sh 
b/taler-build/update_merchant_frontends.sh
deleted file mode 100755
index 8713b08..0000000
--- a/taler-build/update_merchant_frontends.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-for frontend in blog donations survey; do
-  cd $HOME/frontend/
-  git clean -fxd
-
-  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"
-
-  git submodule update --init --force
-
-  ./bootstrap
-  ./configure --prefix="$HOME/local"
-  make install check
-done
diff --git a/taler-build/update_bank.sh b/taler-build/update_survey.sh
similarity index 84%
copy from taler-build/update_bank.sh
copy to taler-build/update_survey.sh
index 42ea74a..4293eb9 100755
--- a/taler-build/update_bank.sh
+++ b/taler-build/update_survey.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-cd $HOME/bank
+cd $HOME/survey/
 git clean -fxd
 
 git fetch
@@ -10,6 +10,8 @@ git fetch
 branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || 
echo HEAD)
 git reset --hard "$branch"
 
+git submodule update --init --force
+
 ./bootstrap
 ./configure --prefix="$HOME/local"
 make install check

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