X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Finit.pp;h=85e7e355840355949ffacaa8d0f1360a933e0a94;hb=dbeb02e7dfb7d85a7362c2460444a3f9aca91c94;hp=9e900bec118e2f7cd8b866e225c0b5704c01fa3c;hpb=2a0513f8f6987fadbcb1dd0e5207a4e80933f91a;p=mirror%2Fdsa-puppet.git diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp index 9e900bec1..85e7e3558 100644 --- a/modules/ssl/manifests/init.pp +++ b/modules/ssl/manifests/init.pp @@ -19,9 +19,14 @@ class ssl { 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', - source => 'puppet:///modules/ssl/ca-certificates-debian.conf', + source => "puppet:///modules/ssl/ca-certificates-debian${ca_debian_conf_suffix}.conf", notify => Exec['refresh_ca_debian_hashes'], } file { '/etc/ca-certificates-global.conf':