projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
956cdc0
..
d7229bc
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-106,6
+106,11
@@
class exim {
source => [ "puppet:///exim/per-host/$fqdn/whitelist",
"puppet:///exim/common/whitelist" ]
;
source => [ "puppet:///exim/per-host/$fqdn/whitelist",
"puppet:///exim/common/whitelist" ]
;
+ "/etc/exim4/submission-domains":
+ require => Package["exim4-daemon-heavy"],
+ source => [ "puppet:///exim/per-host/$fqdn/submission-domains",
+ "puppet:///exim/common/submission-domains" ]
+ ;
"/etc/logrotate.d/exim4-base":
require => Package["exim4-daemon-heavy"],
source => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-base",
"/etc/logrotate.d/exim4-base":
require => Package["exim4-daemon-heavy"],
source => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-base",
@@
-156,14
+161,20
@@
class exim {
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
+
+ case extractnodeinfo($nodeinfo, 'mail_port') {
+ /^(\d+)$/: { $mail_port = $1 }
+ default: { $mail_port = 'smtp' }
+ }
+
@ferm::rule { "dsa-exim":
description => "Allow SMTP",
@ferm::rule { "dsa-exim":
description => "Allow SMTP",
- rule => "&SERVICE_RANGE(tcp,
smtp
, \$SMTP_SOURCES)"
+ rule => "&SERVICE_RANGE(tcp,
$mail_port
, \$SMTP_SOURCES)"
}
@ferm::rule { "dsa-exim-v6":
description => "Allow SMTP",
domain => "ip6",
}
@ferm::rule { "dsa-exim-v6":
description => "Allow SMTP",
domain => "ip6",
- rule => "&SERVICE_RANGE(tcp,
smtp
, \$SMTP_V6_SOURCES)"
+ rule => "&SERVICE_RANGE(tcp,
$mail_port
, \$SMTP_V6_SOURCES)"
}
# Do we actually want this? I'm only doing it because it's harmless
# and makes the logs quiet. There are better ways of making logs quiet,
}
# Do we actually want this? I'm only doing it because it's harmless
# and makes the logs quiet. There are better ways of making logs quiet,
@@
-174,3
+185,6
@@
class exim {
rule => "&SERVICE(tcp, 113)"
}
}
rule => "&SERVICE(tcp, 113)"
}
}
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: