From 05bc00b5f226e6e6695ef00609a02549284c8f55 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Fri, 30 Jul 2021 13:22:45 +0200 Subject: [PATCH] debian: better config split by package --- debian/etc-libtalerexchange/taler/overrides.conf | 1 + debian/{etc => etc-libtalerexchange}/taler/taler.conf | 0 .../apache2/sites-available/taler-auditor.conf} | 0 .../nginx/sites-available/taler-auditor} | 0 .../taler/conf.d/auditor-system.conf | 0 .../taler/secrets/auditor-db.secret.conf | 0 .../apache2/sites-available/taler-exchange.conf} | 0 .../nginx/sites-available/taler-exchange} | 0 .../taler/conf.d/exchange-business.conf | 0 .../taler/conf.d/exchange-system.conf | 0 .../taler/secrets/exchange-accounts.secret.conf | 0 .../taler/secrets/exchange-db.secret.conf | 0 debian/taler-auditor.install | 3 +-- debian/taler-exchange.install | 3 +-- 14 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 debian/etc-libtalerexchange/taler/overrides.conf rename debian/{etc => etc-libtalerexchange}/taler/taler.conf (100%) rename debian/{auditor-conf/apache.conf => etc-taler-auditor/apache2/sites-available/taler-auditor.conf} (100%) rename debian/{auditor-conf/nginx.conf => etc-taler-auditor/nginx/sites-available/taler-auditor} (100%) rename debian/{etc => etc-taler-auditor}/taler/conf.d/auditor-system.conf (100%) rename debian/{etc => etc-taler-auditor}/taler/secrets/auditor-db.secret.conf (100%) rename debian/{exchange-conf/apache.conf => etc-taler-exchange/apache2/sites-available/taler-exchange.conf} (100%) rename debian/{exchange-conf/nginx.conf => etc-taler-exchange/nginx/sites-available/taler-exchange} (100%) rename debian/{etc => etc-taler-exchange}/taler/conf.d/exchange-business.conf (100%) rename debian/{etc => etc-taler-exchange}/taler/conf.d/exchange-system.conf (100%) rename debian/{etc => etc-taler-exchange}/taler/secrets/exchange-accounts.secret.conf (100%) rename debian/{etc => etc-taler-exchange}/taler/secrets/exchange-db.secret.conf (100%) diff --git a/debian/etc-libtalerexchange/taler/overrides.conf b/debian/etc-libtalerexchange/taler/overrides.conf new file mode 100644 index 000000000..60296ead4 --- /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 similarity index 100% rename from debian/etc/taler/taler.conf rename to 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 similarity index 100% rename from debian/auditor-conf/apache.conf rename to 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 similarity index 100% rename from debian/auditor-conf/nginx.conf rename to 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 similarity index 100% rename from debian/etc/taler/conf.d/auditor-system.conf rename to 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 similarity index 100% rename from debian/etc/taler/secrets/auditor-db.secret.conf rename to 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 similarity index 100% rename from debian/exchange-conf/apache.conf rename to 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 similarity index 100% rename from debian/exchange-conf/nginx.conf rename to 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 similarity index 100% rename from debian/etc/taler/conf.d/exchange-business.conf rename to 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 similarity index 100% rename from debian/etc/taler/conf.d/exchange-system.conf rename to 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 similarity index 100% rename from debian/etc/taler/secrets/exchange-accounts.secret.conf rename to 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 similarity index 100% rename from debian/etc/taler/secrets/exchange-db.secret.conf rename to debian/etc-taler-exchange/taler/secrets/exchange-db.secret.conf diff --git a/debian/taler-auditor.install b/debian/taler-auditor.install index 86bfbf8d9..0d7d941a0 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 f43ba2118..9e404ff29 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/*/*