projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Update configuration for SSL ca-debian cert store"
[mirror/dsa-puppet.git]
/
modules
/
ssl
/
manifests
/
init.pp
diff --git
a/modules/ssl/manifests/init.pp
b/modules/ssl/manifests/init.pp
index
85e7e35
..
9e900be
100644
(file)
--- a/
modules/ssl/manifests/init.pp
+++ b/
modules/ssl/manifests/init.pp
@@
-19,14
+19,9
@@
class ssl {
source => 'puppet:///modules/ssl/ca-certificates.conf',
notify => Exec['refresh_normal_hashes'],
}
source => 'puppet:///modules/ssl/ca-certificates.conf',
notify => Exec['refresh_normal_hashes'],
}
- if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
- $ca_debian_conf_suffix = ''
- } else {
- $ca_debian_conf_suffix = '-wheezy'
- }
file { '/etc/ca-certificates-debian.conf':
mode => '0444',
file { '/etc/ca-certificates-debian.conf':
mode => '0444',
- source =>
"puppet:///modules/ssl/ca-certificates-debian${ca_debian_conf_suffix}.conf"
,
+ source =>
'puppet:///modules/ssl/ca-certificates-debian.conf'
,
notify => Exec['refresh_ca_debian_hashes'],
}
file { '/etc/ca-certificates-global.conf':
notify => Exec['refresh_ca_debian_hashes'],
}
file { '/etc/ca-certificates-global.conf':