projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exim: remove debconf hosts from debianhosts
[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
..
0064c8e
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-4,9
+4,10
@@
# @param is_bugsmx this system handles bugs.debian.org
# @param is_mailrelay this system is a mailrelay, both in and out, for debian hosts
# @param is_rtmaster this system handles rt.debian.org
# @param is_bugsmx this system handles bugs.debian.org
# @param is_mailrelay this system is a mailrelay, both in and out, for debian hosts
# @param is_rtmaster this system handles rt.debian.org
-# @param is_packagesmaster this system handles packages
rt
.debian.org
+# @param is_packagesmaster this system handles packages.debian.org
# @param is_packagesqamaster this system handles packages.qa.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,
Boolean $use_smarthost = true,
class exim (
Optional[String] $smarthost,
Boolean $use_smarthost = true,
@@
-16,10
+17,8
@@
class exim (
Boolean $is_packagesmaster = false,
Boolean $is_packagesqamaster = false,
Integer $smarthost_port = 587,
Boolean $is_packagesmaster = false,
Boolean $is_packagesqamaster = false,
Integer $smarthost_port = 587,
+ Optional[Integer] $mail_port = undef,
) {
) {
- include exim::vdomain::setup
- include debian_org::mail_incoming_port
-
if $use_smarthost {
$heavy = false
if $use_smarthost {
$heavy = false
@@
-28,6
+27,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_' }
@@
-42,12
+44,6
@@
class exim (
Package['exim4-daemon-heavy']->Mailalias<| |>
Package['exim4-daemon-heavy']->Mailalias<| |>
- concat::fragment { 'virtual_domain_template':
- target => '/etc/exim4/virtualdomains',
- content => template('exim/virtualdomains.erb'),
- order => '05',
- }
-
service { 'exim4':
ensure => running,
require => [
service { 'exim4':
ensure => running,
require => [
@@
-83,9
+79,14
@@
class exim (
file { '/etc/mailname':
content => template('exim/mailname.erb'),
}
file { '/etc/mailname':
content => template('exim/mailname.erb'),
}
- file { '/etc/exim4/manualroute':
- content => template('exim/manualroute.erb')
+
+ concat { '/etc/exim4/virtualdomains': }
+ concat::fragment { 'virtualdomains_header':
+ target => '/etc/exim4/virtualdomains',
+ content => template('exim/virtualdomains.header.erb'),
+ order => '00',
}
}
+
file { '/etc/exim4/locals':
content => template('exim/locals.erb')
}
file { '/etc/exim4/locals':
content => template('exim/locals.erb')
}