aboutsummaryrefslogtreecommitdiff
path: root/taler-merchant/root/etc/taler/conf.d/merchant.conf.new
diff options
context:
space:
mode:
Diffstat (limited to 'taler-merchant/root/etc/taler/conf.d/merchant.conf.new')
-rw-r--r--taler-merchant/root/etc/taler/conf.d/merchant.conf.new10
1 files changed, 10 insertions, 0 deletions
diff --git a/taler-merchant/root/etc/taler/conf.d/merchant.conf.new b/taler-merchant/root/etc/taler/conf.d/merchant.conf.new
new file mode 100644
index 0000000..4851615
--- /dev/null
+++ b/taler-merchant/root/etc/taler/conf.d/merchant.conf.new
@@ -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