From e1289404e916f6f5a37cd9399d58b43beb9b9ac0 Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Tue, 30 Aug 2022 20:27:32 +0200 Subject: [PATCH] Clean up --- machine.yml | 68 +++++++++---------- root/etc/systemd/system/status-mail@.service | 2 +- root/etc/systemd/system/zfs-scrub@.service | 2 +- .../systemd-mail-systemctl-status.j2} | 4 +- .../systemd-mail-zpool-status.j2} | 4 +- 5 files changed, 40 insertions(+), 40 deletions(-) rename root/usr/local/{bin/systemd-mail.j2 => sbin/systemd-mail-systemctl-status.j2} (70%) rename root/usr/local/{bin/zpool-status-mail.j2 => sbin/systemd-mail-zpool-status.j2} (70%) diff --git a/machine.yml b/machine.yml index 22f0e6a..ea878cc 100644 --- a/machine.yml +++ b/machine.yml @@ -6,36 +6,6 @@ tasks: - # ---------------------------------------------------------------------------------------------- - # Helpful utility programs to help with live system administration. - # ---------------------------------------------------------------------------------------------- - - - name: Install utility programs - apt: - name: - - htop - - man - - # ------------------------------------------------------------------------- - # Unattended upgrades configuration. - # ------------------------------------------------------------------------- - - - name: Install unattended-upgrades - apt: - name: unattended-upgrades - - - name: Configure unattended-upgrades - copy: - src: ./root/etc/apt/apt.conf.d/50unattended-upgrades - dest: /etc/apt/apt.conf.d/50unattended-upgrades - mode: 0644 - - - name: Enable unattended-upgrades - copy: - src: ./root/etc/apt/apt.conf.d/20auto-upgrades - dest: /etc/apt/apt.conf.d/20auto-upgrades - mode: 0644 - # ---------------------------------------------------------------------------------------------- # SSH configuration. # ---------------------------------------------------------------------------------------------- @@ -175,6 +145,26 @@ mail_postfix_conf is changed or mail_postfix_credentials is changed + # ------------------------------------------------------------------------- + # Unattended upgrades configuration. + # ------------------------------------------------------------------------- + + - name: Install unattended-upgrades + apt: + name: unattended-upgrades + + - name: Configure unattended-upgrades + copy: + src: ./root/etc/apt/apt.conf.d/50unattended-upgrades + dest: /etc/apt/apt.conf.d/50unattended-upgrades + mode: 0644 + + - name: Enable unattended-upgrades + copy: + src: ./root/etc/apt/apt.conf.d/20auto-upgrades + dest: /etc/apt/apt.conf.d/20auto-upgrades + mode: 0644 + # ---------------------------------------------------------------------------------------------- # Fail2Ban configuration. # ---------------------------------------------------------------------------------------------- @@ -217,8 +207,8 @@ - name: SystemD mail script template: - src: ./root/usr/local/bin/systemd-mail.j2 - dest: /usr/local/bin/systemd-mail + src: ./root/usr/local/sbin/systemd-mail-systemctl-status.j2 + dest: /usr/local/sbin/systemd-mail-systemctl-status mode: 0755 - name: SystemD mail service @@ -240,8 +230,8 @@ - name: Zpool status mail script template: - src: ./root/usr/local/bin/zpool-status-mail.j2 - dest: /usr/local/bin/zpool-status-mail + src: ./root/usr/local/sbin/systemd-mail-zpool-status.j2 + dest: /usr/local/sbin/systemd-mail-zpool-status mode: 0755 - name: Zfs scrub service file @@ -402,3 +392,13 @@ src: ./root/etc/motd dest: /etc/motd mode: 0644 + + # ---------------------------------------------------------------------------------------------- + # Utility programs. + # ---------------------------------------------------------------------------------------------- + + - name: Install utility programs + apt: + name: + - htop + - man diff --git a/root/etc/systemd/system/status-mail@.service b/root/etc/systemd/system/status-mail@.service index acb0f5b..39d5887 100644 --- a/root/etc/systemd/system/status-mail@.service +++ b/root/etc/systemd/system/status-mail@.service @@ -3,6 +3,6 @@ Description=Status email for %i [Service] Type=oneshot -ExecStart=/usr/local/bin/systemd-mail %i +ExecStart=/usr/local/sbin/systemd-mail-systemctl-status %i User=nobody Group=systemd-journal diff --git a/root/etc/systemd/system/zfs-scrub@.service b/root/etc/systemd/system/zfs-scrub@.service index 762016f..e44a61f 100644 --- a/root/etc/systemd/system/zfs-scrub@.service +++ b/root/etc/systemd/system/zfs-scrub@.service @@ -14,4 +14,4 @@ if /usr/sbin/zpool status %i | grep -q "scrub in progress"; then\ exec /usr/sbin/zpool wait -t scrub %i;\ else exec /usr/sbin/zpool scrub -w %i; fi' ExecStop=-/bin/sh -c '/usr/sbin/zpool scrub -p %i 2>/dev/null || true' -ExecStopPost=/bin/sh -c '/usr/local/bin/zpool-status-mail %i' +ExecStopPost=/bin/sh -c '/usr/local/sbin/systemd-mail-zpool-status %i' diff --git a/root/usr/local/bin/systemd-mail.j2 b/root/usr/local/sbin/systemd-mail-systemctl-status.j2 similarity index 70% rename from root/usr/local/bin/systemd-mail.j2 rename to root/usr/local/sbin/systemd-mail-systemctl-status.j2 index c540ed3..e3e732f 100644 --- a/root/usr/local/bin/systemd-mail.j2 +++ b/root/usr/local/sbin/systemd-mail-systemctl-status.j2 @@ -2,8 +2,8 @@ /usr/sbin/sendmail -t < -Subject: $1 +From: systemd +Subject: systemctl status $1 on {{ hostname }} Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 diff --git a/root/usr/local/bin/zpool-status-mail.j2 b/root/usr/local/sbin/systemd-mail-zpool-status.j2 similarity index 70% rename from root/usr/local/bin/zpool-status-mail.j2 rename to root/usr/local/sbin/systemd-mail-zpool-status.j2 index 6747d83..4bdce80 100644 --- a/root/usr/local/bin/zpool-status-mail.j2 +++ b/root/usr/local/sbin/systemd-mail-zpool-status.j2 @@ -2,8 +2,8 @@ /usr/sbin/sendmail -t < -Subject: zpool status $1 +From: systemd +Subject: zpool status $1 on {{ hostname }} Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8