projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also print cutoff times
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
bb8ad93
..
caf7480
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-109,22
+109,22
@@
class exim {
source => 'puppet:///modules/exim/common/logrotate-exim4-paniclog'
}
file { '/etc/exim4/ssl/thishost.crt':
source => 'puppet:///modules/exim/common/logrotate-exim4-paniclog'
}
file { '/etc/exim4/ssl/thishost.crt':
-
source => "puppet:///modules/ssl/auto-certs/${::fqdn}.crt"
,
+
content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".crt") %>')
,
group => 'Debian-exim',
mode => '0640',
}
file { '/etc/exim4/ssl/thishost.key':
group => 'Debian-exim',
mode => '0640',
}
file { '/etc/exim4/ssl/thishost.key':
-
source => "puppet:///modules/ssl/auto-certs/${::fqdn}.key"
,
+
content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".key") %>')
,
group => 'Debian-exim',
mode => '0640',
}
file { '/etc/exim4/ssl/ca.crt':
group => 'Debian-exim',
mode => '0640',
}
file { '/etc/exim4/ssl/ca.crt':
-
source => 'puppet:///modules/ssl/auto-certs/ca.crt'
,
+
content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crt") %>')
,
group => 'Debian-exim',
mode => '0640',
}
file { '/etc/exim4/ssl/ca.crl':
group => 'Debian-exim',
mode => '0640',
}
file { '/etc/exim4/ssl/ca.crl':
-
source => 'puppet:///modules/ssl/auto-certs/ca.crl'
,
+
content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crl") %>')
,
group => 'Debian-exim',
mode => '0640',
}
group => 'Debian-exim',
mode => '0640',
}