Commit 780a5d40 authored by Raphaël Pinson's avatar Raphaël Pinson
Browse files

satellite: pass relayhost to mta

parent 8395745b

manifests/mta.pp

+4 −3
Original line number Diff line number Diff line
@@ -33,10 +33,11 @@ 
class postfix::mta (

  $mydestination = $postfix::mydestination,

  $mynetworks = $postfix::mynetworks,

  $relayhost = $postfix::relayhost,

) {



  validate_re($postfix::relayhost, '^\S+$',

              'You must pass $relayhost to the postfix class')

  validate_re($relayhost, '^\S+$',

              'Wrong value for $relayhost')

  validate_re($mydestination, '^\S+$',

              'Wrong value for $mydestination')

  validate_re($mynetworks, '^\S+$',
@@ -45,7 +46,7 @@ class postfix::mta ( 
  postfix::config {

    'mydestination':       value => $mydestination;

    'mynetworks':          value => $mynetworks;

    'relayhost':           value => $postfix::relayhost;

    'relayhost':           value => $relayhost;

    'virtual_alias_maps':  value => 'hash:/etc/postfix/virtual';

    'transport_maps':      value => 'hash:/etc/postfix/transport';

  }

manifests/satellite.pp

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
class postfix::satellite (

  $mydestination = $postfix::mydestination,

  $mynetworks    = $postfix::mynetworks,

  $relayhost = $postfix::relayhost,

) {



  validate_re($postfix::myorigin, '^\S+$')
@@ -31,6 +32,7 @@ class postfix::satellite ( 
  class { '::postfix::mta':

    mydestination => $mydestination,

    mynetworks    => $mynetworks,

    relayhost     => $relayhost,

  }



  postfix::virtual { "@${postfix::myorigin}":