From 39079d8af20ad7eebbff41a6f350cfe158c0b3ed Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 30 Jan 2018 01:45:48 +0100
Subject: use url instead of uri

---
 config/generate-config         | 20 ++++++++++----------
 doc/onboarding.texi            |  2 +-
 docker/merchant/entry_point.sh |  2 +-
 docker/taler-full/Dockerfile   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/generate-config b/config/generate-config
index c708a11..5f11192 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -100,9 +100,9 @@ def config(currency, envname, exchange_pub, standalone):
         cfg_put("merchantdb-postgres", "config", "postgres:///taler{}".format(envname))
 
     if standalone:
-        cfg_put("merchant-exchange-test", "uri", "https://env.taler.net/{}/exchange/".format(envname))
+        cfg_put("merchant-exchange-test", "url", "https://env.taler.net/{}/exchange/".format(envname))
     else:
-        cfg_put("merchant-exchange-test", "uri", "https://exchange.{}.taler.net/".format(envname))
+        cfg_put("merchant-exchange-test", "url", "https://exchange.{}.taler.net/".format(envname))
 
     cfg_put("merchant-exchange-test", "master_key", exchange_pub)
 
@@ -135,9 +135,9 @@ def config(currency, envname, exchange_pub, standalone):
         cfg_put("auditordb-postgres", "db_conn_str", "postgres:///taler{}".format(envname))
 
     if standalone:
-        cfg_put("exchange-wire-test", "bank_uri", "https://env.taler.net/{}/bank/".format(envname))
+        cfg_put("exchange-wire-test", "bank_url", "https://env.taler.net/{}/bank/".format(envname))
     else:
-        cfg_put("exchange-wire-test", "bank_uri", "https://bank.{}.taler.net/".format(envname))
+        cfg_put("exchange-wire-test", "bank_url", "https://bank.{}.taler.net/".format(envname))
     cfg_put("exchange-wire-test", "bank_account_number", "1")
     cfg_put("exchange-wire-test", "exchange_account_number", "2")
     cfg_put("exchange-wire-test", "enable", "yes")
@@ -221,12 +221,12 @@ def config(currency, envname, exchange_pub, standalone):
 
 def merchant_wf(envname, instance_name, acct_no, standalone):
     if standalone:
-        bank_uri = "https://env.taler.net/{}/bank/".format(envname)
+        bank_url = "https://env.taler.net/{}/bank/".format(envname)
     else:
-        bank_uri = "https://bank.{}.taler.net/".format(envname)
+        bank_url = "https://bank.{}.taler.net/".format(envname)
     data = OrderedDict(
         type="test",
-        bank_uri=bank_uri,
+        bank_url=bank_url,
         sig="MERCHANTSIGNATURE",
         account_number=acct_no,
         salt="SALT"
@@ -236,13 +236,13 @@ def merchant_wf(envname, instance_name, acct_no, standalone):
 
 def exchange_wf(envname, wfname, acct_no, name, standalone):
     if standalone:
-        bank_uri = "https://env.taler.net/{}/bank/".format(envname)
+        bank_url = "https://env.taler.net/{}/bank/".format(envname)
     else:
-        bank_uri = "https://bank.{}.taler.net/".format(envname)
+        bank_url = "https://bank.{}.taler.net/".format(envname)
     data = OrderedDict(
         name=name,
         type=wfname,
-        bank_uri=bank_uri,
+        bank_url=bank_url,
         account_number=acct_no
     )
     return (wfname, json.dumps(data, indent=2))
diff --git a/doc/onboarding.texi b/doc/onboarding.texi
index adfe58e..d625d17 100644
--- a/doc/onboarding.texi
+++ b/doc/onboarding.texi
@@ -341,7 +341,7 @@ The first step is to fetch the @cite{deployment} repository, which hosts all
 the needed scripts.
 
 @example
-# Adapt the repository's URI to your needs.
+# Adapt the repository's URL to your needs.
 $ git clone /var/git/deployment.git/
 @end example
 
diff --git a/docker/merchant/entry_point.sh b/docker/merchant/entry_point.sh
index 19c554b..515c318 100755
--- a/docker/merchant/entry_point.sh
+++ b/docker/merchant/entry_point.sh
@@ -8,6 +8,6 @@ taler-config -s merchantdb-postgres -o config \
 taler-config -s merchant -o serve -V tcp
 taler-config -s merchant -o port -V 9966
 taler-config -s merchant-exchange-test -o master_key -V $(cat /exchange_pub.txt|tr -d '\n')
-taler-config -s merchant-exchange-test -o uri -V $(cat /exchange_url.txt | tr -d '\n')
+taler-config -s merchant-exchange-test -o url -V $(cat /exchange_url.txt | tr -d '\n')
 taler-merchant-dbinit -r
 taler-merchant-httpd
diff --git a/docker/taler-full/Dockerfile b/docker/taler-full/Dockerfile
index f449737..ac01271 100644
--- a/docker/taler-full/Dockerfile
+++ b/docker/taler-full/Dockerfile
@@ -29,7 +29,7 @@ RUN $HOME/deployment/taler-build/invalidate.sh \
 ENV PATH=/root/local/bin:$PATH
 
 RUN taler-config-generate -e -m -C PUDOS -m -e -w test \
-  --bank-uri https://bank.test.taler.net \
+  --bank-url https://bank.test.taler.net \
   --exchange-bank-account 2 \
   --merchant-bank-account 3 \
   --trusted
-- 
cgit v1.2.3