aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2023-08-23 21:30:35 +0200
committerChristian Grothoff <christian@grothoff.org>2023-08-23 21:30:35 +0200
commita229f63b860de92ed1e306f4face59f2a57c9e65 (patch)
treee165a1026524c6a43d576cf4ee552b46d635fa39
parent7eccc771b6bd99a1feacbd4321767ae8e76e2d2c (diff)
remove unused/dead/duplicated options
-rwxr-xr-xsrc/testing/setup.sh2
-rw-r--r--src/testing/test_key_rotation.conf2
-rw-r--r--src/testing/test_template.conf2
3 files changed, 1 insertions, 5 deletions
diff --git a/src/testing/setup.sh b/src/testing/setup.sh
index 77c2258e..4bf03a32 100755
--- a/src/testing/setup.sh
+++ b/src/testing/setup.sh
@@ -16,7 +16,7 @@ function exit_cleanup()
if [ ! -z ${SETUP_PID+x} ]
then
echo "Killing taler-unified-setup ($SETUP_PID)" >&2
- kill -TERM "$SETUP_PID"
+ kill -TERM "$SETUP_PID" 2> /dev/null || true
wait
fi
}
diff --git a/src/testing/test_key_rotation.conf b/src/testing/test_key_rotation.conf
index 988a5219..9e06992c 100644
--- a/src/testing/test_key_rotation.conf
+++ b/src/testing/test_key_rotation.conf
@@ -12,7 +12,6 @@ CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
[exchange]
MAX_KEYS_CACHING = forever
DB = postgres
-MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
SERVE = tcp
UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
UNIXPATH_MODE = 660
@@ -69,7 +68,6 @@ UNIXPATH_MODE = 660
PORT = 8083
AUDITOR_URL = http://localhost:8083/
TINY_AMOUNT = TESTKUDOS:0.01
-AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
BASE_URL = "http://localhost:8083/"
[bank]
diff --git a/src/testing/test_template.conf b/src/testing/test_template.conf
index ccef8c55..6aefabad 100644
--- a/src/testing/test_template.conf
+++ b/src/testing/test_template.conf
@@ -13,7 +13,6 @@ CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
AML_THRESHOLD = TESTKUDOS:1000000
MAX_KEYS_CACHING = forever
DB = postgres
-MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange-offline/master.priv
MASTER_PUBLIC_KEY = VH2C95R9J44JK7JC87GXBFFAEPGYBSRESH6Y6WG51HRB2ZV7KQW0
SERVE = tcp
UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
@@ -68,7 +67,6 @@ UNIXPATH_MODE = 660
PORT = 8083
AUDITOR_URL = http://localhost:8083/
TINY_AMOUNT = TESTKUDOS:0.01
-AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
BASE_URL = "http://localhost:8083/"
[exchangedb]