From 8f609a95e01ac588d34c8454b1cca5633d270fa4 Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 7 Jul 2022 22:49:08 +0200 Subject: [PATCH] standard mta on arch is not ssmtp so use variable for distro specific mtas --- roles/server/tasks/main.yml | 2 +- roles/server/tasks/utilities/{ssmtp.yml => mta.yml} | 2 +- roles/server/vars/Archlinux.yml | 1 + roles/server/vars/Debian.yml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) rename roles/server/tasks/utilities/{ssmtp.yml => mta.yml} (95%) diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml index ac5bf3e..66edcf9 100644 --- a/roles/server/tasks/main.yml +++ b/roles/server/tasks/main.yml @@ -7,7 +7,7 @@ ignore_errors: True - block: - - include_tasks: utilities/ssmtp.yml + - include_tasks: utilities/mta.yml - include_tasks: utilities/netdata.yml when: netdata is defined and netdata == true - include_tasks: utilities/snmpd.yml diff --git a/roles/server/tasks/utilities/ssmtp.yml b/roles/server/tasks/utilities/mta.yml similarity index 95% rename from roles/server/tasks/utilities/ssmtp.yml rename to roles/server/tasks/utilities/mta.yml index 627800b..15911f8 100644 --- a/roles/server/tasks/utilities/ssmtp.yml +++ b/roles/server/tasks/utilities/mta.yml @@ -1,6 +1,6 @@ - name: server | utilities | install ssmtp package: - name: "ssmtp" + name: "{{ mta_package }}" state: present when: postfix is not defined or postfix == false diff --git a/roles/server/vars/Archlinux.yml b/roles/server/vars/Archlinux.yml index 2c55f3f..9b6ba48 100644 --- a/roles/server/vars/Archlinux.yml +++ b/roles/server/vars/Archlinux.yml @@ -1,3 +1,4 @@ +mta_package: msmtp-mta snmpd_package: net-snmp snmpd_user_file: "/var/net-snmp/snmpd.conf" wireguard_package: wireguard-tools diff --git a/roles/server/vars/Debian.yml b/roles/server/vars/Debian.yml index ca3d821..07ea0a6 100644 --- a/roles/server/vars/Debian.yml +++ b/roles/server/vars/Debian.yml @@ -1,3 +1,4 @@ +mta_package: ssmtp snmpd_package: snmpd snmpd_user_file: "/var/lib/snmp/snmpd.conf" wireguard_package: wireguard