diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 14:03:12 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 14:03:12 -0200 |
| commit | abbdf8399b74e281402b4b58f1fb10b6db768608 (patch) | |
| tree | 2b9aea2eeda5f7bcce84fff5458660853d1008c1 /manifests | |
| parent | b41e194764581e4751a4cd257d1fa5a734428021 (diff) | |
| download | puppet-nodo-abbdf8399b74e281402b4b58f1fb10b6db768608.tar.gz puppet-nodo-abbdf8399b74e281402b4b58f1fb10b6db768608.tar.bz2 | |
Fix mailx definition to be compatible with recent postfix module
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystem/mail.pp | 8 | ||||
| -rw-r--r-- | manifests/subsystem/monkeysphere.pp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp index b0cbf21..23ad865 100644 --- a/manifests/subsystem/mail.pp +++ b/manifests/subsystem/mail.pp @@ -2,8 +2,12 @@ class nodo::subsystem::mail { # Email delivery configuration $mail_delivery = hiera('nodo::subsystem::mail::delivery', 'exim') - package { 'bsd-mailx': - ensure => present, + if $mail_delivery != 'postfix' { + #if !defined(Package['mailx']) { + package { 'mailx': + name => 'bsd-mailx', + ensure => present, + } } case $mail_delivery { diff --git a/manifests/subsystem/monkeysphere.pp b/manifests/subsystem/monkeysphere.pp index 0fb39cb..13372ca 100644 --- a/manifests/subsystem/monkeysphere.pp +++ b/manifests/subsystem/monkeysphere.pp @@ -17,6 +17,6 @@ define nodo::subsystem::monkeysphere( # Email the server key monkeysphere::email_server_keys { "$mail_recipient": - require => Package['bsd-mailx'], + require => Package['mailx'], } } |