From 7bc7ee58ee5bf4708d6781e976524c6198da50cd Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 26 Jul 2021 23:28:44 +0200 Subject: [PATCH] don't use environment files --- debian/taler-auditor.taler-auditor-httpd.service | 1 - debian/taler-exchange.taler-exchange-aggregator.service | 1 - debian/taler-exchange.taler-exchange-httpd.service | 1 - debian/taler-exchange.taler-exchange-httpd.socket | 2 +- debian/taler-exchange.taler-exchange-secmod-eddsa.service | 1 - debian/taler-exchange.taler-exchange-secmod-rsa.service | 1 - debian/taler-exchange.taler-exchange-transfer.service | 1 - debian/taler-exchange.taler-exchange-wirewatch.service | 1 - 8 files changed, 1 insertion(+), 8 deletions(-) diff --git a/debian/taler-auditor.taler-auditor-httpd.service b/debian/taler-auditor.taler-auditor-httpd.service index 08a07327d..c5e1970c8 100644 --- a/debian/taler-auditor.taler-auditor-httpd.service +++ b/debian/taler-auditor.taler-auditor-httpd.service @@ -3,7 +3,6 @@ Description=GNU Taler payment system auditor REST API After=postgres.service network.target [Service] -EnvironmentFile=/etc/default/taler-auditor User=taler-auditor-httpd Type=simple Restart=on-failure diff --git a/debian/taler-exchange.taler-exchange-aggregator.service b/debian/taler-exchange.taler-exchange-aggregator.service index 91b0ade74..95b673e5a 100644 --- a/debian/taler-exchange.taler-exchange-aggregator.service +++ b/debian/taler-exchange.taler-exchange-aggregator.service @@ -2,7 +2,6 @@ Description=GNU Taler payment system exchange aggregator service [Service] -EnvironmentFile=/etc/default/taler-exchange User=taler-exchange-aggregator Type=simple Restart=on-failure diff --git a/debian/taler-exchange.taler-exchange-httpd.service b/debian/taler-exchange.taler-exchange-httpd.service index e88bd84f2..3bfc895d5 100644 --- a/debian/taler-exchange.taler-exchange-httpd.service +++ b/debian/taler-exchange.taler-exchange-httpd.service @@ -6,7 +6,6 @@ Wants=taler-exchange-wirewatch.service taler-exchange-aggregator.service taler-e After=postgres.service network.target [Service] -EnvironmentFile=/etc/default/taler-exchange User=taler-exchange-httpd Type=simple Restart=on-failure diff --git a/debian/taler-exchange.taler-exchange-httpd.socket b/debian/taler-exchange.taler-exchange-httpd.socket index 4401dc4ed..04b82a52e 100644 --- a/debian/taler-exchange.taler-exchange-httpd.socket +++ b/debian/taler-exchange.taler-exchange-httpd.socket @@ -3,7 +3,7 @@ Description=Taler Exchange Socket PartOf=taler-exchange-httpd.service [Socket] -ListenStream=/var/lib/taler-exchange/exchange.sock +ListenStream=/run/taler-exchange/exchange.sock Accept=no Service=taler-exchange-httpd.service SocketUser=taler-exchange-httpd diff --git a/debian/taler-exchange.taler-exchange-secmod-eddsa.service b/debian/taler-exchange.taler-exchange-secmod-eddsa.service index 3bd9cc554..569aaed89 100644 --- a/debian/taler-exchange.taler-exchange-secmod-eddsa.service +++ b/debian/taler-exchange.taler-exchange-secmod-eddsa.service @@ -2,7 +2,6 @@ Description=GNU Taler payment system exchange EdDSA security module [Service] -EnvironmentFile=/etc/default/taler-exchange User=taler-exchange-secmod-eddsa Type=simple Restart=on-failure diff --git a/debian/taler-exchange.taler-exchange-secmod-rsa.service b/debian/taler-exchange.taler-exchange-secmod-rsa.service index 274485473..fa1c263ae 100644 --- a/debian/taler-exchange.taler-exchange-secmod-rsa.service +++ b/debian/taler-exchange.taler-exchange-secmod-rsa.service @@ -2,7 +2,6 @@ Description=GNU Taler payment system exchange RSA security module [Service] -EnvironmentFile=/etc/default/taler-exchange User=taler-exchange-secmod-rsa Type=simple Restart=on-failure diff --git a/debian/taler-exchange.taler-exchange-transfer.service b/debian/taler-exchange.taler-exchange-transfer.service index 00fe977fe..c5b1dcdcd 100644 --- a/debian/taler-exchange.taler-exchange-transfer.service +++ b/debian/taler-exchange.taler-exchange-transfer.service @@ -3,7 +3,6 @@ Description=GNU Taler payment system exchange transfer service After=network.target [Service] -EnvironmentFile=/etc/default/taler-exchange User=taler-exchange-wire Type=simple Restart=on-failure diff --git a/debian/taler-exchange.taler-exchange-wirewatch.service b/debian/taler-exchange.taler-exchange-wirewatch.service index 3f3010626..5054e3199 100644 --- a/debian/taler-exchange.taler-exchange-wirewatch.service +++ b/debian/taler-exchange.taler-exchange-wirewatch.service @@ -3,7 +3,6 @@ Description=GNU Taler payment system exchange wirewatch service After=network.target [Service] -EnvironmentFile=/etc/default/taler-exchange User=taler-exchange-wire Type=simple Restart=on-failure