debian: new config file structure

9 files changed, 44 insertions, 50 deletions

diff --git a/debian/etc/taler-exchange.conf b/debian/etc/taler-exchange.conf
deleted file mode 100644
index 34af223d2..000000000
--- a/debian/etc/taler-exchange.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# First line should be: "INLINE@ taler-exchange-db.conf"
-# 2nd   line should be: "INLINE@ taler-secmod.conf"
-@INLINE@ taler-exchange-db.conf
-@INLINE@ taler-secmod.conf
-# Do not edit this file using 'taler-config', otherwise the line
-# above will be lost!
-#
-# Please read the taler-exchange.README.Debian for how to configure a Taler exchange.
-#
-
-[PATHS]
-
-# Move runtime data "tmp" directory to /var/lib/taler-exchange/
-# to possibly provide additional protection from unwarranted access.
-TALER_RUNTIME_DIR = /var/lib/taler-exchange/tmp/
-
-[exchange]
-# Debian package is configured to use a reverse proxy with a UNIX
-# domain socket. See nginx/apache configuration files.
-SERVE = UNIX
-UNIXPATH = /var/lib/taler-exchange/exchange.sock
-
-# Only supported database is Postgres right now.
-DATABASE = postgres
-
-# Here you MUST add the master public key of the offline system
-# which you can get using `taler-exchange-offline setup`.
-# This is just an example, your key will be different!
-# MASTER_PUBLIC_KEY = YE6Q6TR1EDB7FD0S68TGDZGF1P0GHJD2S0XVV8R2S62MYJ6HJ4ZG
-MASTER_PUBLIC_KEY =
-
-# For your terms of service and privacy policy, you should specify
-# an Etag that must be updated whenever there are significant
-# changes to either document.  The format is up to you, what matters
-# is that the value is updated and never re-used. See the HTTP
-# specification on Etags.
-# TERMS_ETAG =
-# PRIVACY_ETAG =
diff --git a/debian/etc/taler/auditor-service-default.conf b/debian/etc/taler/auditor-service-default.conf
new file mode 100644
index 000000000..d57283ea5
--- /dev/null
+++ b/debian/etc/taler/auditor-service-default.conf
@@ -0,0 +1 @@
+@INCLUDE@ /etc/taler/auditor-system.conf
diff --git a/debian/etc/taler-auditor.conf b/debian/etc/taler/auditor-system.conf
index 50971b2ef..50971b2ef 100644
--- a/debian/etc/taler-auditor.conf
+++ b/debian/etc/taler/auditor-system.conf
diff --git a/debian/etc/taler-secmod.conf b/debian/etc/taler/exchange-business.conf
index 8b3bb34d9..8b97c6089 100644
--- a/debian/etc/taler-secmod.conf
+++ b/debian/etc/taler/exchange-business.conf
@@ -1,13 +1,23 @@
-[PATHS]
-
-# Move runtime data "tmp" directory to /var/lib/taler-exchange/
-# to possibly provide additional protection from unwarranted access.
 TALER_RUNTIME_DIR = /var/lib/taler-exchange/tmp/
 
 [taler]
 # Here you need to set the currency of your exchange:
 # CURRENCY = KUDOS
 
+# Here you MUST add the master public key of the offline system
+# which you can get using `taler-exchange-offline setup`.
+# This is just an example, your key will be different!
+# MASTER_PUBLIC_KEY = YE6Q6TR1EDB7FD0S68TGDZGF1P0GHJD2S0XVV8R2S62MYJ6HJ4ZG
+MASTER_PUBLIC_KEY =
+
+# For your terms of service and privacy policy, you should specify
+# an Etag that must be updated whenever there are significant
+# changes to either document.  The format is up to you, what matters
+# is that the value is updated and never re-used. See the HTTP
+# specification on Etags.
+# TERMS_ETAG =
+# PRIVACY_ETAG =
+
 
 # You must specify the various denominations to be offered by your exchange
 # in sections called "coin_".
diff --git a/debian/etc/taler-exchange-db.conf b/debian/etc/taler/exchange-db.conf
index a6217f486..a7a727b62 100644
--- a/debian/etc/taler-exchange-db.conf
+++ b/debian/etc/taler/exchange-db.conf
@@ -1,5 +1,4 @@
-# This file should contain the access control information to talk to
-# the exchange database.
+# Database configuration for the Taler exchange.
 
 [exchangedb-postgres]
 
diff --git a/debian/etc/taler/exchange-service-default.conf b/debian/etc/taler/exchange-service-default.conf
new file mode 100644
index 000000000..0fa198f88
--- /dev/null
+++ b/debian/etc/taler/exchange-service-default.conf
@@ -0,0 +1,3 @@
+@INCLUDE@ /etc/taler/exchange-system.conf
+@INCLUDE@ /etc/taler/exchange-db.conf
+@INCLUDE@ /etc/taler/exchange-business.conf
diff --git a/debian/etc/taler/exchange-service-wire.conf b/debian/etc/taler/exchange-service-wire.conf
new file mode 100644
index 000000000..d6dc0253c
--- /dev/null
+++ b/debian/etc/taler/exchange-service-wire.conf
@@ -0,0 +1,4 @@
+@INCLUDE@ /etc/taler/exchange-system.conf
+@INCLUDE@ /etc/taler/exchange-db.conf
+@INCLUDE@ /etc/taler/exchange-business.conf
+@INCLUDE@ /etc/taler/exchange-wire-gateway.conf
diff --git a/debian/etc/taler/exchange-system.conf b/debian/etc/taler/exchange-system.conf
new file mode 100644
index 000000000..bdf53fce7
--- /dev/null
+++ b/debian/etc/taler/exchange-system.conf
@@ -0,0 +1,21 @@
+# Configuration settings for system parameters of
+# the exchange.  Should be included in all service-specific
+# configuration files for the exchange.
+#
+# Please read the taler-exchange.README.Debian for how to configure a Taler exchange.
+
+[PATHS]
+
+# Move runtime data "tmp" directory to /var/lib/taler-exchange/
+# to possibly provide additional protection from unwarranted access.
+TALER_RUNTIME_DIR = /var/lib/taler-exchange/tmp/
+
+
+[exchange]
+# Debian package is configured to use a reverse proxy with a UNIX
+# domain socket. See nginx/apache configuration files.
+SERVE = UNIX
+UNIXPATH = /var/lib/taler-exchange/exchange.sock
+
+# Only supported database is Postgres right now.
+DATABASE = postgres
diff --git a/debian/etc/taler-wire.conf b/debian/etc/taler/exchange-wire-gateway.conf
index d0484381a..e5c749c88 100644
--- a/debian/etc/taler-wire.conf
+++ b/debian/etc/taler/exchange-wire-gateway.conf
@@ -1,9 +1,3 @@
-# First line should be: "INLINE@ taler-exchange-db.conf"
-@INLINE@ taler-exchange-db.conf
-# Do not edit this file using 'taler-config', otherwise the line
-# above will be lost!
-
-
 # This file should contain the wire account access information which is needed
 # by the Taler exchange to talk to LibEuFin to interact with the bank.
 # The file SHOULD only be readable for the "taler-exchange-wire" user,