summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp12
-rw-r--r--manifests/satellite.pp3
2 files changed, 14 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index d298183..50ad452 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -53,6 +53,8 @@ class postfix(
$mastercf_tail = '',
$inet_interfaces = 'all',
$myorigin = $::fqdn,
+ $mailname = $::fqdn,
+ $preseed = false,
$default_alias_maps = true
) {
@@ -121,6 +123,16 @@ class postfix(
ensure => installed
}
+ if ( $preseed ) {
+ apt::preseeded_package { 'postfix':
+ ensure => installed,
+ }
+ } else {
+ package { 'postfix':
+ ensure => installed
+ }
+ }
+
if $::operatingsystem == 'debian' {
Package[mailx] { name => 'bsd-mailx' }
}
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':