diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-12-02 10:34:54 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-12-02 10:34:54 +0100 |
| commit | 7c96cb35514dd8170f2064da581880f30e0ca8d2 (patch) | |
| tree | 30d7064edae648b8300cadbfaae6d335ea379075 | |
| parent | bbe803e8bf5071174a294893b68eaf80ca994bf2 (diff) | |
| download | merchant-7c96cb35514dd8170f2064da581880f30e0ca8d2.tar.gz merchant-7c96cb35514dd8170f2064da581880f30e0ca8d2.tar.bz2 merchant-7c96cb35514dd8170f2064da581880f30e0ca8d2.zip | |
fix config file
| -rw-r--r-- | src/backend/merchant.conf | 5 | ||||
| -rw-r--r-- | src/backenddb/Makefile.am | 1 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index fde8b21e..f9c964b2 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -21,6 +21,8 @@ TRUSTED_MINTS = taler x # FIXME: EDATE is a bit short, 'execution_delay'? EDATE = 3 week +DB = postgres + [mint-taler] URI = mint.demo.taler.net @@ -42,8 +44,7 @@ URI = http://taler.ezb.eu/ PUBLIC_KEY = 9QXF7XY7E9VPV47B5Z806NDFSX2VJ79SVHHD29QEQ3BG31ANHZ60 # This specifies which database we use. -# FIXME: should be in a section that has 'postgres' in the name! -[merchant-db] +[merchantdb-postgres] CONFIG = postgres:///talerdemo diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am index 02656185..e70ad206 100644 --- a/src/backenddb/Makefile.am +++ b/src/backenddb/Makefile.am @@ -35,4 +35,5 @@ libtaler_plugin_merchantdb_postgres_la_LDFLAGS = \ -ltalerpq \ -ltalerutil \ -lpq \ + -lgnunetpostgres \ -lgnunetutil $(XLIB) diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index f8502773..836f0377 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -213,7 +213,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls) if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "merchantdb-postgres", - "db_conn_str", + "CONFIG", &pg->connection_cfg_str)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |