Fix mailx definition to be compatible with recent postfix module

diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp
index b0cbf211cfe72f56a7682e4caa38e0bedc69376c..23ad86521860e7afb25bc17f2f85273221286338 100644 (file)
--- 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 0fb39cb746d37f7c02c2576288cbcfb8f8dafa7b..13372caf45cb9f1649823890be7d66eac8c5bcb1 100644 (file)
--- 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'],
   }
 }