Unverified Commit f6c6eb35 authored by Robert Waffen's avatar Robert Waffen Committed by GitHub
Browse files

Merge pull request #333 from cruelsmith/fix_typos_of_326 

Fix typos errors in postfix::satellite from PR 326
parents 82ab6f61 2c295cb0

manifests/mta.pp

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ class postfix::mta ( 
  $_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') {

manifests/satellite.pp

+6 −6
Original line number Diff line number Diff line
@@ -40,17 +40,17 @@ class postfix::satellite ( 
  $_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}":