From 774874a0964f3c14e4379d7e92554b2426c7c4a3 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 16 Jan 2020 20:29:56 +0100
Subject: rename config file to make it clear it is associated with a test

---
 src/lib/bank.conf                  | 13 -------------
 src/lib/bank_twisted.conf          | 39 --------------------------------------
 src/lib/test_bank_api.c            |  3 +--
 src/lib/test_bank_api.conf         | 13 +++++++++++++
 src/lib/test_bank_api_twisted.c    |  2 +-
 src/lib/test_bank_api_twisted.conf | 39 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 54 insertions(+), 55 deletions(-)
 delete mode 100644 src/lib/bank.conf
 delete mode 100644 src/lib/bank_twisted.conf
 create mode 100644 src/lib/test_bank_api.conf
 create mode 100644 src/lib/test_bank_api_twisted.conf

diff --git a/src/lib/bank.conf b/src/lib/bank.conf
deleted file mode 100644
index 906b95fc5..000000000
--- a/src/lib/bank.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[taler]
-currency = KUDOS
-
-[account-1]
-URL = payto://x-taler-bank/localhost:8081/1
-
-[bank]
-SERVE = http
-HTTP_PORT = 8081
-DATABASE = postgres:///talercheck
-
-[exchange-wire-test]
-bank_url = http://localhost:8081/
diff --git a/src/lib/bank_twisted.conf b/src/lib/bank_twisted.conf
deleted file mode 100644
index 71bcaee00..000000000
--- a/src/lib/bank_twisted.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-
-[twister]
-# HTTP listen port for twister
-HTTP_PORT = 8888
-SERVE = tcp
-
-# HTTP Destination for twister.  The test-Webserver needs
-# to listen on the port used here.  Note: no trailing '/'!
-DESTINATION_BASE_URL = "http://localhost:8081"
-
-# Control port for TCP
-# PORT = 8889
-HOSTNAME = localhost
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-
-# Control port for UNIX
-UNIXPATH = /tmp/taler-service-twister.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-# Launching of twister by ARM
-# BINARY = taler-service-twister
-# AUTOSTART = NO
-# FORCESTART = NO
-
-[taler]
-currency = KUDOS
-
-[bank]
-serve = http
-http_port = 8081
-database = postgres:///talercheck
-
-[account-1]
-URL = payto://x-taler-bank/localhost:8081/1
-
-[exchange-wire-test]
-bank_url = http://localhost:8081/
diff --git a/src/lib/test_bank_api.c b/src/lib/test_bank_api.c
index f950f28ab..5ebf76370 100644
--- a/src/lib/test_bank_api.c
+++ b/src/lib/test_bank_api.c
@@ -33,8 +33,7 @@
 #include <microhttpd.h>
 #include "taler_testing_lib.h"
 
-// FIXME: rename config file to make it clear it is associated with a test!
-#define CONFIG_FILE "bank.conf"
+#define CONFIG_FILE "test_bank_api.conf"
 
 /**
  * Bank configuration data.
diff --git a/src/lib/test_bank_api.conf b/src/lib/test_bank_api.conf
new file mode 100644
index 000000000..906b95fc5
--- /dev/null
+++ b/src/lib/test_bank_api.conf
@@ -0,0 +1,13 @@
+[taler]
+currency = KUDOS
+
+[account-1]
+URL = payto://x-taler-bank/localhost:8081/1
+
+[bank]
+SERVE = http
+HTTP_PORT = 8081
+DATABASE = postgres:///talercheck
+
+[exchange-wire-test]
+bank_url = http://localhost:8081/
diff --git a/src/lib/test_bank_api_twisted.c b/src/lib/test_bank_api_twisted.c
index 632bf1cbd..4fe1e37a9 100644
--- a/src/lib/test_bank_api_twisted.c
+++ b/src/lib/test_bank_api_twisted.c
@@ -39,7 +39,7 @@
  * Configuration file we use.  One (big) configuration is used
  * for the various components for this test.
  */
-#define CONFIG_FILE "bank_twisted.conf"
+#define CONFIG_FILE "test_bank_api_twisted.conf"
 
 /**
  * True when the test runs against Fakebank.
diff --git a/src/lib/test_bank_api_twisted.conf b/src/lib/test_bank_api_twisted.conf
new file mode 100644
index 000000000..71bcaee00
--- /dev/null
+++ b/src/lib/test_bank_api_twisted.conf
@@ -0,0 +1,39 @@
+
+[twister]
+# HTTP listen port for twister
+HTTP_PORT = 8888
+SERVE = tcp
+
+# HTTP Destination for twister.  The test-Webserver needs
+# to listen on the port used here.  Note: no trailing '/'!
+DESTINATION_BASE_URL = "http://localhost:8081"
+
+# Control port for TCP
+# PORT = 8889
+HOSTNAME = localhost
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+
+# Control port for UNIX
+UNIXPATH = /tmp/taler-service-twister.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+
+# Launching of twister by ARM
+# BINARY = taler-service-twister
+# AUTOSTART = NO
+# FORCESTART = NO
+
+[taler]
+currency = KUDOS
+
+[bank]
+serve = http
+http_port = 8081
+database = postgres:///talercheck
+
+[account-1]
+URL = payto://x-taler-bank/localhost:8081/1
+
+[exchange-wire-test]
+bank_url = http://localhost:8081/
-- 
cgit v1.2.3