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 bacula 9 no longer does pg service=...
[mirror/dsa-puppet.git]
/
modules
/
ssl
/
manifests
/
init.pp
diff --git
a/modules/ssl/manifests/init.pp
b/modules/ssl/manifests/init.pp
index
73e805a
..
ee83067
100644
(file)
--- a/
modules/ssl/manifests/init.pp
+++ b/
modules/ssl/manifests/init.pp
@@
-35,11
+35,6
@@
class ssl {
notify => Exec['refresh_ca_global_hashes'],
}
notify => Exec['refresh_ca_global_hashes'],
}
- file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
- mode => '0444',
- source => 'puppet:///modules/ssl/local-ssl-ca-global',
- }
-
file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':
ensure => absent,
notify => Exec['refresh_normal_hashes'],
file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':
ensure => absent,
notify => Exec['refresh_normal_hashes'],
@@
-145,6
+140,12
@@
class ssl {
$updatecacerts = $updatecacertsdsa
}
$updatecacerts = $updatecacertsdsa
}
+ file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
+ mode => '0444',
+ content => template('ssl/local-ssl-ca-global.erb'),
+ }
+
+
exec { 'refresh_debian_hashes':
command => 'c_rehash /etc/ssl/debian/certs',
refreshonly => true,
exec { 'refresh_debian_hashes':
command => 'c_rehash /etc/ssl/debian/certs',
refreshonly => true,