From a8948d2f1f46f155eb21544fdc683750fe29196a Mon Sep 17 00:00:00 2001 From: s3lph <1375407-s3lph@users.noreply.gitlab.com> Date: Mon, 18 Apr 2022 22:42:01 +0200 Subject: [PATCH] Fix debian packaging --- package/debian/multischleuder/DEBIAN/postinst | 4 ++ .../etc/multischleuder/multischleuder.yml | 56 +++++++++++++------ .../lib/systemd/system/multischleuder.service | 2 +- 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/package/debian/multischleuder/DEBIAN/postinst b/package/debian/multischleuder/DEBIAN/postinst index 87d78a3..9328f0e 100755 --- a/package/debian/multischleuder/DEBIAN/postinst +++ b/package/debian/multischleuder/DEBIAN/postinst @@ -18,6 +18,10 @@ if [[ "$1" == "configure" ]]; then chown root:multischleuder /etc/multischleuder chmod 0750 /etc/multischleuder + if [[ -f /etc/schleuder/schleuder-certificate.pem && ! -e /etc/multischleuder/schleuder-ca.pem ]]; then + install -o root -g multischleuder -m 0644 /etc/schleuder/schleuder-certificate.pem /etc/multischleuder/schleuder-ca.pem + fi + deb-systemd-helper enable multischleuder.timer deb-systemd-invoke restart multischleuder.timer diff --git a/package/debian/multischleuder/etc/multischleuder/multischleuder.yml b/package/debian/multischleuder/etc/multischleuder/multischleuder.yml index ee87393..65d48ea 100644 --- a/package/debian/multischleuder/etc/multischleuder/multischleuder.yml +++ b/package/debian/multischleuder/etc/multischleuder/multischleuder.yml @@ -2,22 +2,22 @@ api: url: "https://localhost:4443" - token: 2d039a8cfe414e55d1ec9ce9d4d787afc27050a6f630a024ae6c7dc5ab6941e5 + token: "putAschleuderApiTokenHere" cafile: /etc/multischleuder/schleuder-ca.pem -lists: +lists: [] - - target: global@schleuder.example.org - unmanaged: - - admin@example.org - banned: - - banned@example.org - sources: - - east@schleuder.example.org - - west@schleuder.example.org - - north@schleuder.example.org - - south@schleuder.example.org - from: global-owner@schleuder.example.org + #- target: global@schleuder.example.org + # unmanaged: + # - admin@example.org + # banned: + # - banned@example.org + # sources: + # - east@schleuder.example.org + # - west@schleuder.example.org + # - north@schleuder.example.org + # - south@schleuder.example.org + # from: global-owner@schleuder.example.org smtp: hostname: localhost @@ -26,7 +26,7 @@ smtp: conflict: interval: 604800 # 1 week statefile: /var/lib/multischleuder/conflict.json - template: | + key_template: | Hi {subscriber}, While compiling the subscriber list of {schleuder}, your @@ -51,8 +51,32 @@ conflict: message, please refer to your local Schleuder admin, or reply to this message. - Note that this automated message is unsigned, since MultiSchleuder does - not have access to Schleuder private keys. + Regards + MultiSchleuder {schleuder} + user_template: | + Hi {subscriber}, + + While compiling the subscriber list of {schleuder}, your + key {fingerprint} was used by subscribers on multiple sub-lists with + different email adresses. There may be something fishy or malicious + going on, or this may simply have been a mistake by you or a list admin. + + You have only been subscribed to {schleuder} using the address you + have been subscribed with for the *longest* time: + + {chosen} + + Please review the following adresses and talk to the admins of the + corresponding sub-lists to resolve this issue: + + Adress Sub-List + ------ -------- + {affected} + + For your convenience, this message has been sent to *all* of the above + adresses. If you have any questions, or do not understand this + message, please refer to your local Schleuder admin, or reply to this + message. Regards MultiSchleuder {schleuder} diff --git a/package/debian/multischleuder/lib/systemd/system/multischleuder.service b/package/debian/multischleuder/lib/systemd/system/multischleuder.service index 37f1872..4ccfb21 100644 --- a/package/debian/multischleuder/lib/systemd/system/multischleuder.service +++ b/package/debian/multischleuder/lib/systemd/system/multischleuder.service @@ -3,7 +3,7 @@ Description=Multischleuder Sync Job [Service] Type=oneshot -ExecStart=/usr/bin/multischleuder --config=/etc/multischleuder/config.yaml +ExecStart=/usr/bin/multischleuder --config=/etc/multischleuder/multischleuder.yaml User=multischleuder Group=multischleuder WorkingDirectory=/var/lib/multischleuder