projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add mail_port to hiera and the exim class. not yet used
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
6c96081
..
5eb4923
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-6,9
+6,11
@@
# @param is_rtmaster this system handles rt.debian.org
# @param is_packagesmaster this system handles packagesrt.debian.org
# @param is_packagesqamaster this system handles packages.qa.debian.org
# @param is_rtmaster this system handles rt.debian.org
# @param is_packagesmaster this system handles packagesrt.debian.org
# @param is_packagesqamaster this system handles packages.qa.debian.org
-# @param smarthost_port the port on which satellites send mail to the smarthost
+# @param mail_port override the default incoming mailport (only applicable for hosts behind an incoming relay)
+# @param smarthost_port the port on which satellites send mail to the smarthost (needs to be the same on both sides)
class exim (
Optional[String] $smarthost,
class exim (
Optional[String] $smarthost,
+ Optional[Integer] $mail_port,
Boolean $use_smarthost = true,
Boolean $is_bugsmx = false,
Boolean $is_mailrelay = false,
Boolean $use_smarthost = true,
Boolean $is_bugsmx = false,
Boolean $is_mailrelay = false,
@@
-28,6
+30,9
@@
class exim (
}
} else {
$heavy = true
}
} else {
$heavy = true
+ if $mail_port {
+ fail('Cannot override mail_port in heavy/no-smarthost hosts')
+ }
}
munin::check { 'ps_exim4': script => 'ps_' }
}
munin::check { 'ps_exim4': script => 'ps_' }