From fdcac7d6aff6d03aa8a9fb0af85aa91a8c6e7f1e Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 11 Jun 2015 16:11:07 +0200
Subject: fix #3835

---
 contrib/mint-template/config/mint-common.conf         | 13 ++++++++-----
 doc/taler.conf.5                                      | 11 +++++++++--
 src/mint/test_mint_nayapaisa/config/mint-common.conf  |  4 +++-
 src/mint/test_mint_nyadirahim/config/mint-common.conf |  5 ++++-
 src/mintdb/plugin_mintdb_postgres.c                   |  2 +-
 src/mintdb/test-mint-db-postgres.conf                 |  2 ++
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/contrib/mint-template/config/mint-common.conf b/contrib/mint-template/config/mint-common.conf
index 13f5d11bb..918f0f62a 100644
--- a/contrib/mint-template/config/mint-common.conf
+++ b/contrib/mint-template/config/mint-common.conf
@@ -5,13 +5,16 @@ CURRENCY = EUR
 # Wire format supproted by the mint (currently only SEPA is implemented)
 WIREFORMAT = SEPA
 
-# How to access our database
-DB = postgres
-
-DB_CONN_STR = "postgres:///taler"
-
 # HTTP port the mint listens to
 PORT = 4241
 
 # Master public key used to sign the mint's various keys
 MASTER_PUBLIC_KEY = NEGTF62MNGVPZNW19V7S3CRS9D7K04MAHDGX3N6WY2NXREN26J80
+
+# How to access our database
+DB = postgres
+
+
+[mintdb-postgres]
+
+DB_CONN_STR = "postgres:///taler"
diff --git a/doc/taler.conf.5 b/doc/taler.conf.5
index ed26fe150..cb51d8989 100644
--- a/doc/taler.conf.5
+++ b/doc/taler.conf.5
@@ -8,7 +8,7 @@ taler.conf \- Taler configuration file.
 
 .SH DESCRIPTION
 
-The basic structure of the configuration file is the following.  The file is split into sections.  Every section begins with "[SECTIONNAME]" and contains a number of options of the form "OPTION=VALUE".  Empty lines and lines beginning with a "#" are treated as comments.  
+The basic structure of the configuration file is the following.  The file is split into sections.  Every section begins with "[SECTIONNAME]" and contains a number of options of the form "OPTION=VALUE".  Empty lines and lines beginning with a "#" are treated as comments.
 
 .SH MINT OPTIONS
 
@@ -19,12 +19,19 @@ The following options are from the "[mint]" section and used by most mint tools:
 .IP WIREFORMAT
     Format used for wire transfers to the merchant, i.e. "SEPA".
 .IP DB
-    How to access the database, i.e. "postgres:///taler"
+    Plugin to use for the database, i.e. "postgres"
 .IP PORT
     Port on which the HTTP server listens, i.e. 8080.
 .IP MASTER_PUBLIC_KEY
     Crockford Base32-encoded master public key, public version of the mint\'s long\-time offline signing key.
 
+.SH Postgres database options
+
+The following options must be in section "[mintdb-postgres]":
+
+.IP DB_CONN_STR
+    How to access the database, i.e. "postgres:///taler" to use the "taler" database. Testcases use "talercheck".
+
 .SH COIN OPTIONS
 
 The following options must be in sections starting with "[coin_]" and are used by taler\-mint\-keyup to create denomination keys:
diff --git a/src/mint/test_mint_nayapaisa/config/mint-common.conf b/src/mint/test_mint_nayapaisa/config/mint-common.conf
index 6026628b0..f2af32a1b 100644
--- a/src/mint/test_mint_nayapaisa/config/mint-common.conf
+++ b/src/mint/test_mint_nayapaisa/config/mint-common.conf
@@ -1,6 +1,8 @@
 [mint]
-db = postgres:///taler
 port = 4241
 TMH_master_public_key = 6ZE0HEY2M0FWP61M0470HYBF4K6RRD5DP54372PD2TN9N9VX2VJG
 refresh_security_parameter = 3
+DB = postgres
 
+[mintdb-postgres]
+DB_CONN_STR = postgres:///taler
diff --git a/src/mint/test_mint_nyadirahim/config/mint-common.conf b/src/mint/test_mint_nyadirahim/config/mint-common.conf
index beb904538..dde46def0 100644
--- a/src/mint/test_mint_nyadirahim/config/mint-common.conf
+++ b/src/mint/test_mint_nyadirahim/config/mint-common.conf
@@ -1,6 +1,9 @@
 [mint]
-db = postgres:///taler
 port = 4241
 TMH_master_public_key = 7995WKK71KPKTBBMA5BHNBSZFGNRZPYNXDJMQ8EK86V9598H03TG
 refresh_security_parameter = 3
 
+DB = postgres
+
+[mintdb-postgres]
+DB_CONN_STR = postgres:///taler
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c
index bdf643ec0..9445326f0 100644
--- a/src/mintdb/plugin_mintdb_postgres.c
+++ b/src/mintdb/plugin_mintdb_postgres.c
@@ -2960,7 +2960,7 @@ libtaler_plugin_mintdb_postgres_init (void *cls)
   /* FIXME: use configuration section with "postgres" in its name. #3835 */
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "mint",
+                                             "mintdb-postgres",
                                              "db_conn_str",
                                              &pg->connection_cfg_str))
   {
diff --git a/src/mintdb/test-mint-db-postgres.conf b/src/mintdb/test-mint-db-postgres.conf
index 07f8a0e58..2bdb63eb0 100644
--- a/src/mintdb/test-mint-db-postgres.conf
+++ b/src/mintdb/test-mint-db-postgres.conf
@@ -2,5 +2,7 @@
 #The DB plugin to use
 DB = postgres
 
+[mintdb-postgres]
+
 #The connection string the plugin has to use for connecting to the database
 DB_CONN_STR = postgres:///talercheck
-- 
cgit v1.2.3