From abbdf8399b74e281402b4b58f1fb10b6db768608 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 30 Dec 2017 14:03:12 -0200
Subject: Fix mailx definition to be compatible with recent postfix module

---
 manifests/subsystem/mail.pp         | 8 ++++++--
 manifests/subsystem/monkeysphere.pp | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'manifests')

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'],
   }
 }
-- 
cgit v1.2.3