aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/taler-config-generate4
-rwxr-xr-xbin/taler-deployment-prepare4
-rwxr-xr-xbin/taler-deployment-start4
-rw-r--r--taler-arm/taler-exchange-secmod-eddsa.conf4
-rw-r--r--taler-arm/taler-exchange-secmod-rsa.conf4
-rw-r--r--taler-arm/taler-helper-crypto-eddsa.conf4
-rw-r--r--taler-arm/taler-helper-crypto-rsa.conf4
7 files changed, 14 insertions, 14 deletions
diff --git a/bin/taler-config-generate b/bin/taler-config-generate
index 1bf17e9..659fe64 100755
--- a/bin/taler-config-generate
+++ b/bin/taler-config-generate
@@ -153,8 +153,8 @@ def config(obj):
obj.cfg_put("auditor", "unixpath", "$HOME/sockets/auditor.http")
obj.cfg_put("auditor", "tiny_amount", obj.currency + ":0.01")
- obj.cfg_put("taler-helper-crypto-eddsa", "unixpath", "$HOME/sockets/taler-helper-crypto-eddsa.sock")
- obj.cfg_put("taler-helper-crypto-rsa", "unixpath", "$HOME/sockets/taler-helper-crypto-rsa.sock")
+ obj.cfg_put("taler-exchange-secmod-eddsa", "unixpath", "$HOME/sockets/taler-exchange-secmod-eddsa.sock")
+ obj.cfg_put("taler-exchange-secmod-rsa", "unixpath", "$HOME/sockets/taler-exchange-secmod-rsa.sock")
obj.cfg_put("exchange", "base_url", urls["exchange"])
diff --git a/bin/taler-deployment-prepare b/bin/taler-deployment-prepare
index 35dbd36..8e8d407 100755
--- a/bin/taler-deployment-prepare
+++ b/bin/taler-deployment-prepare
@@ -106,8 +106,8 @@ taler-deployment-arm -s
# Quickly start+shutdown exchange httpd and crypto SM helpers
taler-deployment-arm -i taler-exchange
-taler-deployment-arm -i taler-helper-crypto-rsa
-taler-deployment-arm -i taler-helper-crypto-eddsa
+taler-deployment-arm -i taler-exchange-secmod-rsa
+taler-deployment-arm -i taler-exchange-secmod-eddsa
sleep 2 # FIXME: poll keys?
if ! taler-deployment-arm -I | grep "^taler-exchange" | grep "status=started" > /dev/null; then
echo "Exchange didn't start, cannot set up keys"
diff --git a/bin/taler-deployment-start b/bin/taler-deployment-start
index 2dba088..b50f112 100755
--- a/bin/taler-deployment-start
+++ b/bin/taler-deployment-start
@@ -19,8 +19,8 @@ fi
taler-deployment-arm -s
taler-deployment-arm -i taler-exchange
-taler-deployment-arm -i taler-helper-crypto-eddsa
-taler-deployment-arm -i taler-helper-crypto-rsa
+taler-deployment-arm -i taler-exchange-secmod-eddsa
+taler-deployment-arm -i taler-exchange-secmod-rsa
taler-deployment-arm -i taler-auditor
taler-deployment-arm -i taler-merchant
taler-deployment-arm -i taler-demobank
diff --git a/taler-arm/taler-exchange-secmod-eddsa.conf b/taler-arm/taler-exchange-secmod-eddsa.conf
new file mode 100644
index 0000000..b83c6cf
--- /dev/null
+++ b/taler-arm/taler-exchange-secmod-eddsa.conf
@@ -0,0 +1,4 @@
+[taler-exchange-secmod-eddsa]
+TYPE = simple
+BINARY = taler-exchange-secmod-eddsa
+OPTIONS = -l $HOME/logs/crypto-eddsa-%Y-%m-%d.log
diff --git a/taler-arm/taler-exchange-secmod-rsa.conf b/taler-arm/taler-exchange-secmod-rsa.conf
new file mode 100644
index 0000000..32fcc56
--- /dev/null
+++ b/taler-arm/taler-exchange-secmod-rsa.conf
@@ -0,0 +1,4 @@
+[taler-exchange-secmod-rsa]
+TYPE = simple
+BINARY = taler-exchange-secmod-rsa
+OPTIONS = -l $HOME/logs/crypto-rsa-%Y-%m-%d.log
diff --git a/taler-arm/taler-helper-crypto-eddsa.conf b/taler-arm/taler-helper-crypto-eddsa.conf
deleted file mode 100644
index 7945725..0000000
--- a/taler-arm/taler-helper-crypto-eddsa.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[taler-helper-crypto-eddsa]
-TYPE = simple
-BINARY = taler-helper-crypto-eddsa
-OPTIONS = -l $HOME/logs/crypto-eddsa-%Y-%m-%d.log
diff --git a/taler-arm/taler-helper-crypto-rsa.conf b/taler-arm/taler-helper-crypto-rsa.conf
deleted file mode 100644
index 11be090..0000000
--- a/taler-arm/taler-helper-crypto-rsa.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[taler-helper-crypto-rsa]
-TYPE = simple
-BINARY = taler-helper-crypto-rsa
-OPTIONS = -l $HOME/logs/crypto-rsa-%Y-%m-%d.log