projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop duplicate definition
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
572b40c
..
1d4a252
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-8,9
+8,9
@@
class exim {
group => root,
mode => 664,
source => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
group => root,
mode => 664,
source => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
- "puppet:///exim/common/exim4.conf" ]
+ "puppet:///exim/common/exim4.conf" ]
,
require => Package["exim4-heavy"],
require => Package["exim4-heavy"],
- notify => Exec["exim4 reload"]
,
+ notify => Exec["exim4 reload"]
;
"/etc/exim4/blacklist":
owner => root,
;
"/etc/exim4/blacklist":
owner => root,
@@
-28,14
+28,6
@@
class exim {
source => [ "puppet:///exim/per-host/$fqdn/callout_users",
"puppet:///exim/common/" ]
;
source => [ "puppet:///exim/per-host/$fqdn/callout_users",
"puppet:///exim/common/" ]
;
- "/etc/exim4/exim4.conf":
- owner => root,
- group => root,
- mode => 664,
- require => Package["exim4-heavy"],
- source => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
- "puppet:///exim/common/" ]
- ;
"/etc/exim4/grey_users":
owner => root,
group => root,
"/etc/exim4/grey_users":
owner => root,
group => root,