[taler-deployment] branch master updated (d0d8879 -> 22564dd)

[gnunet]

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

ms pushed a change to branch master
in repository deployment.

    from d0d8879  sandbox config BB
     new b303769  POS instance, submodule workaround
     new 22564dd  comment

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:
 docker/demo/config/deployment.conf                  | 2 ++
 docker/demo/images/base/Dockerfile                  | 5 +++++
 docker/demo/images/libeufin/create_bank_accounts.sh | 2 ++
 docker/demo/images/merchant/create_instances.sh     | 3 +++
 docker/demo/images/merchant/startup.sh              | 1 +
 5 files changed, 13 insertions(+)

diff --git a/docker/demo/config/deployment.conf 
b/docker/demo/config/deployment.conf
index 9fc1f7a..aed9a06 100644
--- a/docker/demo/config/deployment.conf
+++ b/docker/demo/config/deployment.conf
@@ -18,6 +18,8 @@ exchange-sandbox-username = exchange-at-sandbox
 exchange-sandbox-password = secret-at-sandbox
 blog-sandbox-username = blog-at-sandbox
 blog-sandbox-password = secret-at-sandbox
+pos-sandbox-username = pos-at-sandbox
+pos-sandbox-password = secret-at-sandbox
 gnunet-sandbox-username = gnunet-at-sandbox
 gnunet-sandbox-password = secret-at-sandbox
 taler-sandbox-username = taler-at-sandbox
diff --git a/docker/demo/images/base/Dockerfile 
b/docker/demo/images/base/Dockerfile
index d8e4961..5647d85 100644
--- a/docker/demo/images/base/Dockerfile
+++ b/docker/demo/images/base/Dockerfile
@@ -41,6 +41,11 @@ RUN ./configure --enable-logging=verbose 
--disable-documentation
 RUN make install
 
 WORKDIR /exchange
+RUN git -C contrib/gana checkout 6b9824c # v0.9.0-compatible commit
+# Workaround a reported issue where the bootstrap script
+# always pulls the latest submodule version.  That breaks
+# when moving the main repository to past versions.
+RUN git submodule set-uri contrib/gana .
 RUN ./bootstrap
 RUN ./configure CFLAGS="-ggdb -O0" --enable-logging=verbose --disable-doc
 RUN make install
diff --git a/docker/demo/images/libeufin/create_bank_accounts.sh 
b/docker/demo/images/libeufin/create_bank_accounts.sh
index 449f46e..7bae214 100644
--- a/docker/demo/images/libeufin/create_bank_accounts.sh
+++ b/docker/demo/images/libeufin/create_bank_accounts.sh
@@ -7,6 +7,8 @@ SURVEY_IBAN=DE731371
 
 EXCHANGE_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s 
taler-deployment -o exchange-sandbox-username`
 EXCHANGE_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s 
taler-deployment -o exchange-sandbox-password`
+POS_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s 
taler-deployment -o pos-sandbox-username`
+POS_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s 
taler-deployment -o pos-sandbox-password`
 BLOG_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s 
taler-deployment -o blog-sandbox-username`
 BLOG_SANDBOX_PASSWORD=`taler-config -c /config/deployment.conf -s 
taler-deployment -o blog-sandbox-password`
 GNUNET_SANDBOX_USERNAME=`taler-config -c /config/deployment.conf -s 
taler-deployment -o gnunet-sandbox-username`
diff --git a/docker/demo/images/merchant/create_instances.sh 
b/docker/demo/images/merchant/create_instances.sh
index 2098663..4053d90 100644
--- a/docker/demo/images/merchant/create_instances.sh
+++ b/docker/demo/images/merchant/create_instances.sh
@@ -1,6 +1,9 @@
 echo -n "Create default instance..."
 curl -s -H "Content-Type: application/json" -X POST -d 
'{"auth":{"method":"external"},"payto_uris":["payto://iban/SANDBOXX/'$DEFAULT_IBAN'?receiver-name=Merchant43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"'${CURRENCY}':1",
 
"default_max_deposit_fee":"'${CURRENCY}':1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us"
 : 1},"default_pay_delay":{"d_us": 3600000000}}' 
http://merchant/management/instances
 echo DONE
+echo -n "Create pos instance..."
+curl -s -H "Content-Type: application/json" -X POST -d 
'{"auth":{"method":"external"},"payto_uris":["payto://iban/SANDBOXX/'$POS_IBAN'?receiver-name=PoS"],"id":"pos","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"'${CURRENCY}':1",
 
"default_max_deposit_fee":"'${CURRENCY}':1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us"
 : 1000000},"default_pay_delay":{"d_us": 3600000000}}' 
http://merchant/management/instances
+echo DONE
 echo -n "Create blog instance..."
 curl -s -H "Content-Type: application/json" -X POST -d 
'{"auth":{"method":"external"},"payto_uris":["payto://iban/SANDBOXX/'$BLOG_IBAN'?receiver-name=BlogCompany"],"id":"blog","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"'${CURRENCY}':1",
 
"default_max_deposit_fee":"'${CURRENCY}':1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us"
 : 1000000},"default_pay_delay":{"d_us": 3600000000}}' 
http://merchant/management/instances
 echo DONE
diff --git a/docker/demo/images/merchant/startup.sh 
b/docker/demo/images/merchant/startup.sh
index 7ba17c7..90548f0 100644
--- a/docker/demo/images/merchant/startup.sh
+++ b/docker/demo/images/merchant/startup.sh
@@ -14,6 +14,7 @@ EXCHANGE_URL=`taler-config -c /config/deployment.conf -s 
taler-deployment -o def
 DB_PASSWORD=`taler-config -c /config/deployment.conf -s taler-deployment -o 
db-password`
 
 BLOG_IBAN=DE940993
+POS_IBAN=DE445094
 GNUNET_IBAN=DE463312
 DEFAULT_IBAN=DE474361
 TOR_IBAN=DE358263

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.