aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-12-25 09:04:27 +0100
committerChristian Grothoff <christian@grothoff.org>2020-12-25 09:04:27 +0100
commit2c856ebe3c2c70ccd591ae3447b2bacfba589559 (patch)
tree90e8df435b75efdecb06f94a27b3d63af64db388
parentd5d2fc12f54fbfe608f66417b0b350c2bd94d516 (diff)
use BASE_URL consistently
-rw-r--r--src/auditor/auditor.conf2
-rw-r--r--src/auditor/generate-auditor-basedb.conf1
-rw-r--r--src/auditor/report-lib.c4
-rw-r--r--src/auditor/test-auditor.conf2
-rw-r--r--src/testing/test_auditor_api.conf2
5 files changed, 5 insertions, 6 deletions
diff --git a/src/auditor/auditor.conf b/src/auditor/auditor.conf
index 81b9322fa..270836283 100644
--- a/src/auditor/auditor.conf
+++ b/src/auditor/auditor.conf
@@ -17,7 +17,7 @@ AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
# What is the Web site of the auditor (i.e. to file complaints about
# a misbehaving exchange)?
-# AUDITOR_URL = https://auditor.taler.net/
+# BASE_URL = https://auditor.taler.net/
# Network configuration for the normal API/service HTTP server
diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf
index 9f5292d7d..5cd28269f 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -45,7 +45,6 @@ SERVE = tcp
UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
UNIXPATH_MODE = 660
PORT = 8083
-AUDITOR_URL = http://localhost:8083/
BASE_URL = http://localhost:8083/
TINY_AMOUNT = TESTKUDOS:0.01
diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c
index e3b41b1a8..6334e6f65 100644
--- a/src/auditor/report-lib.c
+++ b/src/auditor/report-lib.c
@@ -681,12 +681,12 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c)
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (TALER_ARL_cfg,
"auditor",
- "AUDITOR_URL",
+ "BASE_URL",
&TALER_ARL_auditor_url))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"auditor",
- "AUDITOR_URL");
+ "BASE_URL");
return GNUNET_SYSERR;
}
if (GNUNET_YES == GNUNET_is_zero (&TALER_ARL_master_pub))
diff --git a/src/auditor/test-auditor.conf b/src/auditor/test-auditor.conf
index 3017e61f9..2089b156f 100644
--- a/src/auditor/test-auditor.conf
+++ b/src/auditor/test-auditor.conf
@@ -1,7 +1,7 @@
[auditor]
DB = postgres
TINY_AMOUNT = TESTKUDOS:0.01
-AUDITOR_URL = http://localhost:8083/
+BASE_URL = http://localhost:8083/
[exchange-account-1]
PAYTO_URI = payto://x-taler-bank/localhost/Exchange
diff --git a/src/testing/test_auditor_api.conf b/src/testing/test_auditor_api.conf
index 169c46734..a03044523 100644
--- a/src/testing/test_auditor_api.conf
+++ b/src/testing/test_auditor_api.conf
@@ -11,7 +11,7 @@ CURRENCY = EUR
CURRENCY_ROUND_UNIT = EUR:0.01
[auditor]
-AUDITOR_URL = "http://localhost:8083/"
+BASE_URL = "http://localhost:8083/"
# HTTP port the auditor listens to
PORT = 8083