diff options
| author | Micah Anderson <micah@riseup.net> | 2015-05-06 14:12:01 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2015-05-06 14:12:01 -0400 |
| commit | f7fc77ec14eedafc08895c7d2555d457c758b34e (patch) | |
| tree | 9c6fdd468c007f7da4b5f3953f8479082f2def22 /manifests/satellite.pp | |
| parent | 1103a73ab4253712c6446bba7a443619fe516717 (diff) | |
| parent | 1fe24e63dc39bef3379b0e75d8c81f4f6db0072e (diff) | |
Merge branch 'master' into leap
Conflicts:
manifests/satellite.pp
Diffstat (limited to 'manifests/satellite.pp')
| -rw-r--r-- | manifests/satellite.pp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/satellite.pp b/manifests/satellite.pp index da818a5..c6c1a0e 100644 --- a/manifests/satellite.pp +++ b/manifests/satellite.pp @@ -21,12 +21,17 @@ # } # } # -class postfix::satellite ( +class postfix::satellite( $relayhost = '', $valid_fqdn = $::fqdn, $root_mail_recipient = '' ) { + # If $valid_fqdn is provided, use it to override $fqdn + if $valid_fqdn != $::fdqn { + $fqdn = $valid_fqdn + } + class { 'postfix': root_mail_recipient => $root_mail_recipient, myorigin => $valid_fqdn, |