projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chopin should know about security.d.o mail before we move the mx record
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
712526f
..
0b5f7d6
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-1,4
+1,13
@@
class exim {
class exim {
+ activate_munin_check {
+ "ps_exim4": script => "ps_";
+ "exim_mailqueue":;
+ "exim_mailstats":;
+ "postfix_mailqueue": ensure => absent;
+ "postfix_mailstats": ensure => absent;
+ "postfix_mailvolume": ensure => absent;
+ }
+
package { exim4-daemon-heavy: ensure => installed }
package { exim4-daemon-heavy: ensure => installed }
@@
-15,18
+24,25
@@
class exim {
owner => root,
group => Debian-exim,
mode => 750,
owner => root,
group => Debian-exim,
mode => 750,
+ require => Package["exim4-daemon-heavy"],
purge => true
;
purge => true
;
+ "/etc/mailname":
+ content => template("exim/mailname.erb"),
+ ;
"/etc/exim4/exim4.conf":
"/etc/exim4/exim4.conf":
- source => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
- "puppet:///exim/common/exim4.conf" ],
+ content => template("exim/eximconf.erb"),
require => Package["exim4-daemon-heavy"],
notify => Exec["exim4 reload"]
require => Package["exim4-daemon-heavy"],
notify => Exec["exim4 reload"]
-
;
+ ;
"/etc/exim4/manualroute":
require => Package["exim4-daemon-heavy"],
"/etc/exim4/manualroute":
require => Package["exim4-daemon-heavy"],
- source => [ "puppet:///exim/per-host/$fqdn/manualroute",
- "puppet:///exim/common/manualroute" ]
+ content => template("exim/manualroute.erb")
+ ;
+ "/etc/exim4/host_blacklist":
+ require => Package["exim4-daemon-heavy"],
+ source => [ "puppet:///exim/per-host/$fqdn/host_blacklist",
+ "puppet:///exim/common/host_blacklist" ]
;
"/etc/exim4/blacklist":
require => Package["exim4-daemon-heavy"],
;
"/etc/exim4/blacklist":
require => Package["exim4-daemon-heavy"],
@@
-50,8
+66,7
@@
class exim {
;
"/etc/exim4/locals":
require => Package["exim4-daemon-heavy"],
;
"/etc/exim4/locals":
require => Package["exim4-daemon-heavy"],
- source => [ "puppet:///exim/per-host/$fqdn/locals",
- "puppet:///exim/common/locals" ]
+ content => template("exim/locals.erb")
;
"/etc/exim4/localusers":
require => Package["exim4-daemon-heavy"],
;
"/etc/exim4/localusers":
require => Package["exim4-daemon-heavy"],
@@
-92,12
+107,6
@@
class exim {
source => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
"puppet:///exim/common/logrotate-exim4-paniclog" ]
;
source => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
"puppet:///exim/common/logrotate-exim4-paniclog" ]
;
- "/etc/exim4/local-settings.conf":
- require => Package["exim4-daemon-heavy"],
- source => [ "puppet:///exim/per-host/$fqdn/local-settings.conf",
- "puppet:///exim/common/local-settings.conf" ],
- notify => Exec["exim4 reload"]
- ;
"/etc/exim4/local-auto.conf":
require => Package["exim4-daemon-heavy"],
content => template("exim-local-auto.erb"),
"/etc/exim4/local-auto.conf":
require => Package["exim4-daemon-heavy"],
content => template("exim-local-auto.erb"),
@@
-138,8
+147,3
@@
class exim {
refreshonly => true,
}
}
refreshonly => true,
}
}
-
-class eximmx inherits exim {
- include clamav
- include postgrey
-}