From 10897aa03a835da270b0c613e1308e6b11096545 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Fri, 11 Sep 2020 13:08:49 +0200 Subject: [PATCH] Standardise a mailer setup At least on Debian 10, use msmtp and install a basic configuration. Previously the network was using a mishmash of exim, sendmail or whatever happened to be installed. For the moment, install the config also on debian9, some of which are using ssmtp, which is no longer maintained in debian :( --- modules/rhizo_base/files/etc/aliases | 1 + modules/rhizo_base/manifests/init.pp | 10 ++++++++++ modules/rhizo_base/manifests/packages.pp | 2 +- modules/rhizo_base/templates/msmtprc.erb | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 modules/rhizo_base/files/etc/aliases create mode 100644 modules/rhizo_base/templates/msmtprc.erb diff --git a/modules/rhizo_base/files/etc/aliases b/modules/rhizo_base/files/etc/aliases new file mode 100644 index 0000000..b1a25f9 --- /dev/null +++ b/modules/rhizo_base/files/etc/aliases @@ -0,0 +1 @@ +root: postmaster@rhizomatica.org diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index e6a6228..725b12f 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -681,4 +681,14 @@ schedule { 'never': ip => '10.23.0.11', } + file { '/etc/aliases': + ensure => 'present', + source => 'puppet:///modules/rhizo_base/etc/aliases' + } + + file { '/etc/msmtprc': + ensure => 'present', + content => template('rhizo_base/msmtprc.erb') + } + } diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp index c7a8217..0cea030 100644 --- a/modules/rhizo_base/manifests/packages.pp +++ b/modules/rhizo_base/manifests/packages.pp @@ -38,7 +38,7 @@ class rhizo_base::packages::common { class rhizo_base::packages::buster inherits rhizo_base::packages::common { - package { ['libcdk5nc6' ]: + package { ['libcdk5nc6', 'msmtp-mta' ]: ensure => installed, require => Class['rhizo_base::apt'], } diff --git a/modules/rhizo_base/templates/msmtprc.erb b/modules/rhizo_base/templates/msmtprc.erb new file mode 100644 index 0000000..ee8b828 --- /dev/null +++ b/modules/rhizo_base/templates/msmtprc.erb @@ -0,0 +1,15 @@ +defaults +port 25 +tls off +auto_from +domain <%= @hostname %>.vm.rhizomatica.org +maildomain vm.rhizomatica.org +aliases /etc/aliases + +account rhizo +host mail +from root@<%= @hostname %>.vm.rhizomatica.org +auth off +user root + +account default: rhizo