adapt merchant to taler-config splitv0.14.1-dev.2

3 files changed, 26 insertions, 0 deletions

diff --git a/debian/etc/taler/conf.d/merchant.conf b/debian/etc/taler-merchant/conf.d/merchant.conf
index 48516157..48516157 100644
--- a/debian/etc/taler/conf.d/merchant.conf
+++ b/debian/etc/taler-merchant/conf.d/merchant.conf
diff --git a/debian/etc/taler/secrets/merchant-db.secret.conf b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf
index 6cbbb24c..6cbbb24c 100644
--- a/debian/etc/taler/secrets/merchant-db.secret.conf
+++ b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf
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