diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-06-03 11:13:12 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-06-03 11:13:12 +0200 |
| commit | 0bdb35317ad118a6e57ef6c412f58d0c3b6c7f16 (patch) | |
| tree | 1d101a838ff764f8c2f66bb1b19e7787bc0c470d | |
| parent | af2b53194d4c4c8227927d08eba128009f355e58 (diff) | |
| download | deployment-0bdb35317ad118a6e57ef6c412f58d0c3b6c7f16.tar.gz deployment-0bdb35317ad118a6e57ef6c412f58d0c3b6c7f16.tar.bz2 deployment-0bdb35317ad118a6e57ef6c412f58d0c3b6c7f16.zip | |
use exec-compile
| -rwxr-xr-x | bin/taler-config-generate | 5 | ||||
| -rw-r--r-- | buildbot/master.cfg | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bin/taler-config-generate b/bin/taler-config-generate index d83dc14..54a4012 100755 --- a/bin/taler-config-generate +++ b/bin/taler-config-generate @@ -132,11 +132,12 @@ def config(obj): obj.cfg_put("merchantdb-postgres", "config", "postgres:///taler{}".format(obj.envname)) if "demo" != obj.envname and obj.twisted: - obj.cfg_put("merchant-exchange-test", "url", "https://twister-exchange.wild.gv.taler.net/") + obj.cfg_put("merchant-exchange-test", "exchange_base_url", "https://twister-exchange.wild.gv.taler.net/") else: - obj.cfg_put("merchant-exchange-test", "url", "https://exchange.{}.taler.net/".format(obj.envname)) + obj.cfg_put("merchant-exchange-test", "exchange_base_url", "https://exchange.{}.taler.net/".format(obj.envname)) obj.cfg_put("merchant-exchange-test", "master_key", obj.exchange_pub) + obj.cfg_put("merchant-exchange-test", "currency", obj.currency) obj.cfg_put("frontends", "backend_apikey", "sandbox".format(obj.envname)) diff --git a/buildbot/master.cfg b/buildbot/master.cfg index aff8f8a..f8e1c22 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -953,7 +953,7 @@ c["titleURL"] = "https://taler.net" # We use nginx to expose the BB under this URL. c["buildbotURL"] = "https://buildbot.taler.net/" -from taler_bb_userpass_db import USER_PASSWORD_DB +exec(compile(open('../taler_bb_userpass_db/taler_bb_userpass_db/db.py').read())) BUILDER_LIST = [ "buildmaster-builder", |