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 ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
0b5f7d6
..
cf1699d
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-19,6
+19,20
@@
class exim {
mode => 755,
purge => true
;
mode => 755,
purge => true
;
+ "/etc/exim4/Git":
+ ensure => directory,
+ purge => true,
+ force => true,
+ recurse => true,
+ source => puppet:///empty/
+ ;
+ "/etc/exim4/conf.d":
+ ensure => directory,
+ purge => true,
+ force => true,
+ recurse => true,
+ source => puppet:///empty/
+ ;
"/etc/exim4/ssl":
ensure => directory,
owner => root,
"/etc/exim4/ssl":
ensure => directory,
owner => root,
@@
-78,11
+92,6
@@
class exim {
source => [ "puppet:///exim/per-host/$fqdn/rbllist",
"puppet:///exim/common/rbllist" ]
;
source => [ "puppet:///exim/per-host/$fqdn/rbllist",
"puppet:///exim/common/rbllist" ]
;
- "/etc/exim4/rcpthosts":
- require => Package["exim4-daemon-heavy"],
- source => [ "puppet:///exim/per-host/$fqdn/rcpthosts",
- "puppet:///exim/common/rcpthosts" ]
- ;
"/etc/exim4/rhsbllist":
require => Package["exim4-daemon-heavy"],
source => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
"/etc/exim4/rhsbllist":
require => Package["exim4-daemon-heavy"],
source => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
@@
-107,11
+116,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-auto.conf":
- require => Package["exim4-daemon-heavy"],
- content => template("exim-local-auto.erb"),
- notify => Exec["exim4 reload"]
- ;
"/etc/exim4/ssl/thishost.crt":
require => Package["exim4-daemon-heavy"],
source => "puppet:///exim/certs/$fqdn.crt",
"/etc/exim4/ssl/thishost.crt":
require => Package["exim4-daemon-heavy"],
source => "puppet:///exim/certs/$fqdn.crt",