Merge pull request #333 from cruelsmith/fix_typos_of_326

Fix typos errors in postfix::satellite from PR 326
voxpupuli · Jun 21, 2022 · f6c6eb3 · f6c6eb3
2 parents 82ab6f6 + 2c295cb
commit f6c6eb3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/manifests/mta.pp b/manifests/mta.pp
@@ -41,9 +41,9 @@
   $_mydestination = pick($mydestination, $postfix::mydestination)
   $_mynetworks = pick($mynetworks, $postfix::mynetworks)
   $_relayhost = pick($relayhost, $postfix::relayhost)
-  $_masquerade_classes    = pick_default($masquerade_classes, $postfix::masquerade_classes)
-  $_masquerade_domains    = pick_default($masquerade_domains, $postfix::masquerade_domains)
-  $_masquerade_exceptions = pick_default($masquerade_exceptions, $postfix::masquerade_exceptions)
+  $_masquerade_classes    = $masquerade_classes.lest || { $postfix::masquerade_classes }
+  $_masquerade_domains    = $masquerade_domains.lest || { $postfix::masquerade_domains }
+  $_masquerade_exceptions = $masquerade_exceptions.lest || { $postfix::masquerade_exceptions }
 
   # If direct is specified then relayhost should be blank
   if ($_relayhost == 'direct') {

diff --git a/manifests/satellite.pp b/manifests/satellite.pp
@@ -40,17 +40,17 @@
   $_mydestination = pick($mydestination, $postfix::mydestination)
   $_mynetworks = pick($mynetworks, $postfix::mynetworks)
   $_relayhost = pick($relayhost, $postfix::relayhost)
-  $_masquerade_classes    = pick_default($masquerade_classes, $postfix::masquerade_classes)
-  $_masquerade_domains    = pick_default($masquerade_domains, $postfix::masquerade_domains)
-  $_masquerade_exceptions = pick_default($masquerade_exceptions, $postfix::masquerade_exceptions)
+  $_masquerade_classes    = $masquerade_classes.lest || { $postfix::masquerade_classes }
+  $_masquerade_domains    = $masquerade_domains.lest || { $postfix::masquerade_domains }
+  $_masquerade_exceptions = $masquerade_exceptions.lest || { $postfix::masquerade_exceptions }
 
   class { 'postfix::mta':
     mydestination         => $_mydestination,
     mynetworks            => $_mynetworks,
     relayhost             => $_relayhost,
-    masquerade_classes    => $masquerade_classes,
-    masquerade_domains    => $masquerade_domains,
-    masquerade_exceptions => $masquerade_exceptions,
+    masquerade_classes    => $_masquerade_classes,
+    masquerade_domains    => $_masquerade_domains,
+    masquerade_exceptions => $_masquerade_exceptions,
   }
 
   postfix::virtual { "@${postfix::myorigin}":