anastasis

4 files changed, 38 insertions, 5 deletions

diff --git a/bin/taler-deployment-config-generate b/bin/taler-deployment-config-generate
index 5ab54a1..1ee404a 100755
--- a/bin/taler-deployment-config-generate
+++ b/bin/taler-deployment-config-generate
@@ -147,6 +147,7 @@ def config(obj):
         "exchange_base_url",
         urls["exchange"],
     )
+
     obj.cfg_put("auditor", "serve", "unix")
     obj.cfg_put("auditor", "base_url", urls["auditor"])
     obj.cfg_put("auditor", "auditor_url", urls["auditor"])
@@ -245,17 +246,31 @@ def main(currency, envname, outdir, exchange_pub, frontends_apitoken):
     config_files.append(mc)
 
     urls = get_urls(envname)
+
     sc = ConfigFile(envname, currency, exchange_pub, "sync.conf")
-    sc.cfg_put("taler", "currency", sc.currency)
+    sc.cfg_put("taler", "currency", currency)
     sc.cfg_put("sync", "serve", "unix")
-    sc.cfg_put("sync", "apikey", f"Bearer {frontends_apitoken}")
     sc.cfg_put("sync", "unixpath", "$HOME/sockets/sync.http")
-    sc.cfg_put("sync", "annual_fee", sc.currency + ":0.1")
+    sc.cfg_put("sync", "apikey", f"Bearer {frontends_apitoken}")
+    sc.cfg_put("sync", "annual_fee", f"{currency}:0.1")
     sc.cfg_put("sync", "fulfillment_url", "taler://fulfillment-success/")
     sc.cfg_put("sync", "payment_backend_url", urls["merchant_backend"] + "instances/Taler/")
-    sc.cfg_put("syncdb-postgres", "config", "postgres:///taler%s" % envname)
+    sc.cfg_put("syncdb-postgres", "config", f"postgres:///taler{envname}")
     config_files.append(sc)
 
+    ac = ConfigFile(envname, currency, exchange_pub, "anastasis.conf")
+    ac.cfg_put("taler", "currency", currency)
+    sc.cfg_put("anastasis", "serve", "unix")
+    sc.cfg_put("anastasis", "unixpath", "$HOME/sockets/anastasis.http")
+    sc.cfg_put("anastasis", "annual_fee", f"{currency}:0")
+    sc.cfg_put("anastasis", "question_cost", f"{currency}:0")
+    sc.cfg_put("anastasis", "fulfillment_url", "taler://fulfillment-success/")
+    sc.cfg_put("anastasis", "server_salt", "kreb3ia9dmj43gfa")
+    sc.cfg_put("statis-postgres", "config", f"postgres:///taler{envname}")
+    sc.cfg_put("anastasis-merchant-backend", "payment_backend_url", urls["merchant_backend"] + "instances/anastasis/")
+    sc.cfg_put("anastasis-merchant-backend", "api_key", f"Bearer {frontends_apitoken}")
+    config_files.append(ac)
+
     assert 0 < len(config_files)
     for obj in config_files:
         obj.cfg_write(outdir)
diff --git a/bin/taler-deployment-config-instances b/bin/taler-deployment-config-instances
index 4d55919..9895737 100755
--- a/bin/taler-deployment-config-instances
+++ b/bin/taler-deployment-config-instances
@@ -219,6 +219,13 @@ ensure_instance(
     auth=dict(method="token", token=TALER_ENV_FRONTENDS_APITOKEN),
 )
 
+ensure_instance(
+    "anastasis",
+    name="Tor",
+    payto_uris=[f"payto://x-taler-bank/bank.{TALER_ENV_NAME}.taler.net/anastasis"],
+    auth=dict(method="token", token=TALER_ENV_FRONTENDS_APITOKEN),
+)
+
 # Note: this instance has a fixed secret-token, so as to allow anyone to easily
 # run their tutorial.
 ensure_instance(
@@ -228,4 +235,3 @@ ensure_instance(
     auth=dict(method="token", token="secret-token:sandbox")
 )
 
-
diff --git a/bin/taler-deployment-prepare b/bin/taler-deployment-prepare
index d5299e1..d40291e 100755
--- a/bin/taler-deployment-prepare
+++ b/bin/taler-deployment-prepare
@@ -209,6 +209,8 @@ esac
 
 if test $WITH_DB_RESET = yes; then
   taler-merchant-dbinit --reset
+else
+  taler-merchant-dbinit
 fi
 
 # Making sure ARM is not running yet.
@@ -261,3 +263,9 @@ taler-deployment-arm -k taler-exchange
 taler-deployment-arm -k taler-exchange-secmod-rsa
 taler-deployment-arm -k taler-exchange-secmod-eddsa
 taler-deployment-arm -e
+
+##
+## Step 7: Set up anastasis
+##
+
+anastasis-dbinit
diff --git a/taler-arm/anastasis.conf b/taler-arm/anastasis.conf
new file mode 100644
index 0000000..43921f6
--- /dev/null
+++ b/taler-arm/anastasis.conf
@@ -0,0 +1,4 @@
+[anastasis]
+TYPE = simple
+BINARY = anastasis-httpd
+OPTIONS = -l $HOME/logs/anastasis-%Y-%m-%d.log