summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-07-30 13:22:45 +0200
committerFlorian Dold <florian@dold.me>2021-07-30 13:22:54 +0200
commit05bc00b5f226e6e6695ef00609a02549284c8f55 (patch)
tree7ca6ca6faeefc25e5eb932f96b15b806ba4ca742
parentbd603ca7c14315d333e2dac0509f6b1226fb946e (diff)
downloadexchange-05bc00b5f226e6e6695ef00609a02549284c8f55.tar.gz
exchange-05bc00b5f226e6e6695ef00609a02549284c8f55.tar.bz2
exchange-05bc00b5f226e6e6695ef00609a02549284c8f55.zip
debian: better config split by package
-rw-r--r--debian/etc-libtalerexchange/taler/overrides.conf1
-rw-r--r--debian/etc-libtalerexchange/taler/taler.conf (renamed from debian/etc/taler/taler.conf)0
-rw-r--r--debian/etc-taler-auditor/apache2/sites-available/taler-auditor.conf (renamed from debian/auditor-conf/apache.conf)0
-rw-r--r--debian/etc-taler-auditor/nginx/sites-available/taler-auditor (renamed from debian/auditor-conf/nginx.conf)0
-rw-r--r--debian/etc-taler-auditor/taler/conf.d/auditor-system.conf (renamed from debian/etc/taler/conf.d/auditor-system.conf)0
-rw-r--r--debian/etc-taler-auditor/taler/secrets/auditor-db.secret.conf (renamed from debian/etc/taler/secrets/auditor-db.secret.conf)0
-rw-r--r--debian/etc-taler-exchange/apache2/sites-available/taler-exchange.conf (renamed from debian/exchange-conf/apache.conf)0
-rw-r--r--debian/etc-taler-exchange/nginx/sites-available/taler-exchange (renamed from debian/exchange-conf/nginx.conf)0
-rw-r--r--debian/etc-taler-exchange/taler/conf.d/exchange-business.conf (renamed from debian/etc/taler/conf.d/exchange-business.conf)0
-rw-r--r--debian/etc-taler-exchange/taler/conf.d/exchange-system.conf (renamed from debian/etc/taler/conf.d/exchange-system.conf)0
-rw-r--r--debian/etc-taler-exchange/taler/secrets/exchange-accounts.secret.conf (renamed from debian/etc/taler/secrets/exchange-accounts.secret.conf)0
-rw-r--r--debian/etc-taler-exchange/taler/secrets/exchange-db.secret.conf (renamed from debian/etc/taler/secrets/exchange-db.secret.conf)0
-rw-r--r--debian/taler-auditor.install3
-rw-r--r--debian/taler-exchange.install3
14 files changed, 3 insertions, 4 deletions
diff --git a/debian/etc-libtalerexchange/taler/overrides.conf b/debian/etc-libtalerexchange/taler/overrides.conf
new file mode 100644
index 00000000..60296ead
--- /dev/null
+++ b/debian/etc-libtalerexchange/taler/overrides.conf
@@ -0,0 +1 @@
+# This configuration will be changed by tooling. Do not touch it manually.
diff --git a/debian/etc/taler/taler.conf b/debian/etc-libtalerexchange/taler/taler.conf
index 71663be5..71663be5 100644
--- a/debian/etc/taler/taler.conf
+++ b/debian/etc-libtalerexchange/taler/taler.conf
diff --git a/debian/auditor-conf/apache.conf b/debian/etc-taler-auditor/apache2/sites-available/taler-auditor.conf
index f68c5955..f68c5955 100644
--- a/debian/auditor-conf/apache.conf
+++ b/debian/etc-taler-auditor/apache2/sites-available/taler-auditor.conf
diff --git a/debian/auditor-conf/nginx.conf b/debian/etc-taler-auditor/nginx/sites-available/taler-auditor
index 3fdffdad..3fdffdad 100644
--- a/debian/auditor-conf/nginx.conf
+++ b/debian/etc-taler-auditor/nginx/sites-available/taler-auditor
diff --git a/debian/etc/taler/conf.d/auditor-system.conf b/debian/etc-taler-auditor/taler/conf.d/auditor-system.conf
index 3d3aef33..3d3aef33 100644
--- a/debian/etc/taler/conf.d/auditor-system.conf
+++ b/debian/etc-taler-auditor/taler/conf.d/auditor-system.conf
diff --git a/debian/etc/taler/secrets/auditor-db.secret.conf b/debian/etc-taler-auditor/taler/secrets/auditor-db.secret.conf
index b81bb817..b81bb817 100644
--- a/debian/etc/taler/secrets/auditor-db.secret.conf
+++ b/debian/etc-taler-auditor/taler/secrets/auditor-db.secret.conf
diff --git a/debian/exchange-conf/apache.conf b/debian/etc-taler-exchange/apache2/sites-available/taler-exchange.conf
index 3cfbf9ed..3cfbf9ed 100644
--- a/debian/exchange-conf/apache.conf
+++ b/debian/etc-taler-exchange/apache2/sites-available/taler-exchange.conf
diff --git a/debian/exchange-conf/nginx.conf b/debian/etc-taler-exchange/nginx/sites-available/taler-exchange
index 6737d912..6737d912 100644
--- a/debian/exchange-conf/nginx.conf
+++ b/debian/etc-taler-exchange/nginx/sites-available/taler-exchange
diff --git a/debian/etc/taler/conf.d/exchange-business.conf b/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf
index 92d968f4..92d968f4 100644
--- a/debian/etc/taler/conf.d/exchange-business.conf
+++ b/debian/etc-taler-exchange/taler/conf.d/exchange-business.conf
diff --git a/debian/etc/taler/conf.d/exchange-system.conf b/debian/etc-taler-exchange/taler/conf.d/exchange-system.conf
index 7fb65d98..7fb65d98 100644
--- a/debian/etc/taler/conf.d/exchange-system.conf
+++ b/debian/etc-taler-exchange/taler/conf.d/exchange-system.conf
diff --git a/debian/etc/taler/secrets/exchange-accounts.secret.conf b/debian/etc-taler-exchange/taler/secrets/exchange-accounts.secret.conf
index 7b6c649f..7b6c649f 100644
--- a/debian/etc/taler/secrets/exchange-accounts.secret.conf
+++ b/debian/etc-taler-exchange/taler/secrets/exchange-accounts.secret.conf
diff --git a/debian/etc/taler/secrets/exchange-db.secret.conf b/debian/etc-taler-exchange/taler/secrets/exchange-db.secret.conf
index 596dcc92..596dcc92 100644
--- a/debian/etc/taler/secrets/exchange-db.secret.conf
+++ b/debian/etc-taler-exchange/taler/secrets/exchange-db.secret.conf
diff --git a/debian/taler-auditor.install b/debian/taler-auditor.install
index 86bfbf8d..0d7d941a 100644
--- a/debian/taler-auditor.install
+++ b/debian/taler-auditor.install
@@ -15,7 +15,6 @@ usr/share/taler/config.d/auditor*
usr/share/taler/sql/auditor/*
# Configuration
-debian/etc/taler/conf.d/auditor* etc/taler/conf.d/
-debian/etc/taler/secrets/auditor* etc/taler/secrets/
+debian/etc-taler-auditor/* etc/
usr/share/taler/exchange/auditor-report.tex.j2
diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
index f43ba211..9e404ff2 100644
--- a/debian/taler-exchange.install
+++ b/debian/taler-exchange.install
@@ -22,8 +22,7 @@ usr/share/info/taler-exchange*
usr/share/taler/config.d/*
# configuration files in /etc/taler
-debian/etc/taler/conf.d/exchange* etc/taler/conf.d/
-debian/etc/taler/secrets/exchange* etc/taler/secrets/
+debian/etc-taler-exchange etc/
usr/share/taler/exchange/pp/*/*
usr/share/taler/exchange/tos/*/*