projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New template for all.
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
d045a97
..
4d503f1
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-18,11
+18,10
@@
class exim {
purge => true
;
"/etc/exim4/exim4.conf":
purge => true
;
"/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"],
source => [ "puppet:///exim/per-host/$fqdn/manualroute",
"/etc/exim4/manualroute":
require => Package["exim4-daemon-heavy"],
source => [ "puppet:///exim/per-host/$fqdn/manualroute",
@@
-50,8
+49,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"],
@@
-75,8
+73,7
@@
class exim {
;
"/etc/exim4/virtualdomains":
require => Package["exim4-daemon-heavy"],
;
"/etc/exim4/virtualdomains":
require => Package["exim4-daemon-heavy"],
- source => [ "puppet:///exim/per-host/$fqdn/virtualdomains",
- "puppet:///exim/common/virtualdomains" ]
+ content => template("exim/virtualdomains.erb")
;
"/etc/exim4/whitelist":
require => Package["exim4-daemon-heavy"],
;
"/etc/exim4/whitelist":
require => Package["exim4-daemon-heavy"],
@@
-93,6
+90,12
@@
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"),