3 files changed, 44 insertions, 0 deletions
diff --git a/debian/etc/taler-merchant/conf.d/merchant.conf b/debian/etc/taler-merchant/conf.d/merchant.conf
new file mode 100644
index 00000000..48516157
--- /dev/null
+++ b/debian/etc/taler-merchant/conf.d/merchant.conf
@@ -0,0 +1,10 @@
+# Read secret sections into configuration, but only
+# if we have permission to do so.
+@inline-secret@ merchantdb-postgres ../secrets/merchant-db.secret.conf
+
+[merchant]
+DATABASE = postgres
+SERVE = unix
+
+# Merchant-specific overrides, included last to take precedence.
+@inline-matching@ ../merchant-overrides.conf
diff --git a/debian/etc/taler-merchant/secrets/merchant-db.secret.conf b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf
new file mode 100644
index 00000000..6cbbb24c
--- /dev/null
+++ b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf
@@ -0,0 +1,8 @@
+[merchantdb-postgres]
+
+# Typically, there should only be a single line here, of the form:
+
+CONFIG=postgres:///taler-merchant
+
+# The details of the URI depend on where the database lives and how
+# access control was configured.
diff --git a/debian/etc/taler-merchant/taler-merchant.conf b/debian/etc/taler-merchant/taler-merchant.conf
new file mode 100644
index 00000000..9eb70e2e
--- /dev/null
+++ b/debian/etc/taler-merchant/taler-merchant.conf
@@ -0,0 +1,26 @@
+# Main entry point for the GNU Taler configuration.
+#
+# Structure:
+# - taler-merchant.conf is the main configuration entry point
+#   used by all Taler merchant components (the file you are currently
+#   looking at.
+# - overrides.conf contains configuration overrides that are
+#   set by some tools that help with the configuration,
+#   and should not be edited by humans.  Comments in this file
+#   are not preserved.
+# - conf.d/ contains configuration files for
+#   Taler components, which can be read by all
+#   users of the system and are included by the main
+#   configuration.
+# - secrets/ contains configuration snippets
+#   with secrets for particular services.
+#   These files should have restrictive permissions
+#   so that only users of the relevant services
+#   can read it.  All files in it should end with
+#   ".secret.conf".
+
+# Inline configurations from all Taler components.
+@inline-matching@ conf.d/*.conf
+
+# Overrides from tools that help with configuration.
+@inline@ overrides.conf