]> gitweb.fluxo.info Git - puppet-postfix.git/commitdiff
Check if mailx package is not already defined by other modules
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 30 Dec 2017 15:59:46 +0000 (13:59 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 30 Dec 2017 15:59:46 +0000 (13:59 -0200)
manifests/init.pp

index 3637cdd3b8ff947203fd465f5b1bf3be61bd6760..8ee2346190be9d9dcb0f0ad22d044fb920cbe456 100644 (file)
@@ -119,12 +119,18 @@ class postfix(
     include postfix::virtual_regexp
   }
 
-  package { ['postfix', 'mailx']:
-    ensure => installed
+  package { 'postfix':
+    ensure => installed,
   }
 
-  if $::operatingsystem == 'debian' {
-    Package[mailx] { name => 'bsd-mailx' }
+  if !defined(Package['mailx']) {
+    package { 'mailx':
+      ensure => installed,
+      name   => $::operatingsystem ? {
+        debian  => 'bsd-mailx',
+        default => 'mailx',
+      },
+    }
   }
 
   service { 'postfix':