diff options
author | MS <ms@taler.net> | 2022-09-14 13:42:37 +0200 |
---|---|---|
committer | MS <ms@taler.net> | 2022-09-14 13:42:37 +0200 |
commit | bf6fe4325c01a8ea6ba2b84e41ad045c316ea678 (patch) | |
tree | 0ea16d1ca70c163c3b0c08dfb674729d487595de | |
parent | 7186bec3e7e52f2243b1433a068a1b0248c5a596 (diff) | |
download | deployment-bf6fe4325c01a8ea6ba2b84e41ad045c316ea678.tar.gz deployment-bf6fe4325c01a8ea6ba2b84e41ad045c316ea678.tar.bz2 deployment-bf6fe4325c01a8ea6ba2b84e41ad045c316ea678.zip |
fix API key config for sync
-rwxr-xr-x | bin/taler-gv | 6 | ||||
-rwxr-xr-x | bin/taler-local | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/bin/taler-gv b/bin/taler-gv index 9f80abe..993ef81 100755 --- a/bin/taler-gv +++ b/bin/taler-gv @@ -1070,8 +1070,7 @@ def prepare(postgres_db_name): "${TALER_DATA_HOME}/merchant/wire/merchant.json", ) obj.cfg_put("merchant-account-merchant", "wire_file_mode", "770") - - obj.cfg_put("frontends", "backend_apikey", f"{frontend_api_key}") + obj.cfg_put("frontends", "backend_apikey", frontend_api_key) coin(obj, currency, "ct_10", "0.10") coin(obj, currency, "1", "1") coin(obj, currency, "2", "2") @@ -1091,7 +1090,7 @@ def prepare(postgres_db_name): obj.cfg_put("taler", "currency", currency) obj.cfg_put("sync", "serve", "unix") obj.cfg_put("sync", "unixpath", str(unix_sockets_dir / "sync.http")) - obj.cfg_put("sync", "apikey", f"Bearer secret-token:{api_key}") + obj.cfg_put("sync", "api_key", f"Bearer {api_key}") obj.cfg_put("sync", "annual_fee", f"{currency}:0.1") obj.cfg_put("sync", "fulfillment_url", "taler://fulfillment-success/") obj.cfg_put( @@ -1382,6 +1381,7 @@ def prepare(postgres_db_name): ], custom_name="set-wire-fee" ).run() + print(" OK") print_nn("Setting global fees for the next 5 years...") for year in range(YEAR, YEAR+5): Command( diff --git a/bin/taler-local b/bin/taler-local index 3f77d1a..4e33848 100755 --- a/bin/taler-local +++ b/bin/taler-local @@ -1070,8 +1070,10 @@ def prepare(x_forwarded_host, x_forwarded_proto, postgres_db_name): "${TALER_DATA_HOME}/merchant/wire/merchant.json", ) obj.cfg_put("merchant-account-merchant", "wire_file_mode", "770") - - obj.cfg_put("frontends", "backend_apikey", f"{frontend_api_key}") + # The demo shops prepend the "Bearer " part. NOTE: should + # this be changed to match 'sync', since it expects also the + # "Bearer " part? + obj.cfg_put("frontends", "backend_apikey", frontend_api_key) coin(obj, currency, "ct_10", "0.10") coin(obj, currency, "1", "1") coin(obj, currency, "2", "2") @@ -1092,10 +1094,10 @@ def prepare(x_forwarded_host, x_forwarded_proto, postgres_db_name): obj.cfg_put("taler", "currency", currency) obj.cfg_put("sync", "serve", "unix") obj.cfg_put("sync", "unixpath", str(unix_sockets_dir / "sync.sock")) - obj.cfg_put("sync", "apikey", f"Bearer secret-token:{api_key}") + obj.cfg_put("sync", "api_key", f"Bearer {api_key}") obj.cfg_put("sync", "annual_fee", f"{currency}:0.1") obj.cfg_put("sync", "fulfillment_url", "taler://fulfillment-success/") - obj.cfg_put("sync", "payment_backend_url", rev_proxy_url + "merchant-backend/instances/Taler/") + obj.cfg_put("sync", "payment_backend_url", rev_proxy_url + "/merchant-backend/instances/Taler/") obj.cfg_put("syncdb-postgres", "config", f"postgres:///{postgres_db_name}") obj.cfg_write(outdir) |