diff options
| -rw-r--r-- | manifests/init.pp | 18 | ||||
| -rw-r--r-- | manifests/satellite.pp | 3 |
2 files changed, 17 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index f454be9..a90e790 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -52,7 +52,9 @@ class postfix( $use_smtps = "no", $mastercf_tail = "", $inet_interfaces = 'all', - $myorigin = $::fqdn + $myorigin = $::fqdn, + $mailname = $::fqdn, + $preseed = false ) { # selinux labels differ from one distribution to another @@ -98,10 +100,20 @@ class postfix( include postfix::virtual_regexp } - package { ["postfix", "mailx"]: + package { 'mailx': ensure => installed } + if ( $preseed ) { + apt::preseeded_package { 'postfix': + ensure => installed, + } + } else { + package { 'postfix': + ensure => installed + } + } + if $::operatingsystem == 'debian' { Package[mailx] { name => 'bsd-mailx' } } @@ -113,7 +125,7 @@ class postfix( file { "/etc/mailname": ensure => present, - content => "${fqdn}\n", + content => "${mailname}\n", seltype => $postfix_seltype, } diff --git a/manifests/satellite.pp b/manifests/satellite.pp index 45a40ad..c6c1a0e 100644 --- a/manifests/satellite.pp +++ b/manifests/satellite.pp @@ -21,7 +21,6 @@ # } # } # - class postfix::satellite( $relayhost = '', $valid_fqdn = $::fqdn, @@ -35,6 +34,8 @@ class postfix::satellite( class { 'postfix': root_mail_recipient => $root_mail_recipient, + myorigin => $valid_fqdn, + mailname => $valid_fqdn } class { 'postfix::mta': |