aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystem/mail.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-12-30 14:03:12 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-12-30 14:03:12 -0200
commitabbdf8399b74e281402b4b58f1fb10b6db768608 (patch)
tree2b9aea2eeda5f7bcce84fff5458660853d1008c1 /manifests/subsystem/mail.pp
parentb41e194764581e4751a4cd257d1fa5a734428021 (diff)
downloadpuppet-nodo-abbdf8399b74e281402b4b58f1fb10b6db768608.tar.gz
puppet-nodo-abbdf8399b74e281402b4b58f1fb10b6db768608.tar.bz2
Fix mailx definition to be compatible with recent postfix module
Diffstat (limited to 'manifests/subsystem/mail.pp')
-rw-r--r--manifests/subsystem/mail.pp8
1 files changed, 6 insertions, 2 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 {