summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-06-06 11:40:01 +0200
committerChristian Grothoff <christian@grothoff.org>2017-06-06 11:40:01 +0200
commit122c7fb7209316a21bda9e9b4fea5e9afa266498 (patch)
tree60b086a9a2d402e054ec03210a750462d6c46900
parent68d26724dbd0a25cd3ee8d4dc300a17514637c59 (diff)
downloaddeployment-122c7fb7209316a21bda9e9b4fea5e9afa266498.tar.gz
deployment-122c7fb7209316a21bda9e9b4fea5e9afa266498.tar.bz2
deployment-122c7fb7209316a21bda9e9b4fea5e9afa266498.zip
fix deployment script and instructions
-rwxr-xr-xbootstrap-bluegreen4
-rwxr-xr-xbootstrap-standalone4
-rw-r--r--doc/onboarding.texi5
3 files changed, 7 insertions, 6 deletions
diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen
index 21f3042..905e0a1 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; do
+for component in bank merchant gnurl landing exchange merchant-frontends deployment ; do
if ! test -d $HOME/$component; then
git clone /var/git/$component.git
fi
done
-for component in bank merchant landing exchange merchant-frontends auditor; do
+for component in bank merchant landing exchange merchant-frontends ; do
echo "Checking out $component to $BRANCH"
git -C $HOME/$component checkout $BRANCH
done
diff --git a/bootstrap-standalone b/bootstrap-standalone
index 9c648b7..88ada0e 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 auditor; do
+for component in bank merchant gnurl landing exchange merchant-frontends deployment ; do
if ! test -d $HOME/$component; then
git clone /var/git/$component.git
fi
done
-for component in bank merchant landing exchange merchant-frontends auditor; do
+for component in bank merchant landing exchange merchant-frontends ; do
echo "Checking out $component to $BRANCH"
git -C $HOME/$component checkout $BRANCH
done
diff --git a/doc/onboarding.texi b/doc/onboarding.texi
index dafc05f..2fe9c6d 100644
--- a/doc/onboarding.texi
+++ b/doc/onboarding.texi
@@ -370,7 +370,8 @@ After the update is over, the @cite{/home/demo/sockets} symlink will be pointed
$ find $HOME -exec rm -fr @{@} \;
$ git clone /var/git/deployment.git
-$ ./deployment/bootstrap-bluegreen demo
+# Pick color depending on which one is inactive and being rebuilt.
+$ ./deployment/bootstrap-bluegreen demo [blue|green]
# set environment appropriately
$ . activate
@@ -456,7 +457,7 @@ make dist
See @emph{https://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads}
-Directive file:
+Directive file:
@example
version: 1.2