class ssl {
- $caconf = '/etc/ca-certificates.conf'
-
package { 'openssl':
ensure => installed,
}
ensure => installed,
}
+ if has_role('insecure_ssl') {
+ $extra_ssl_certs_flags = ' --default'
+ $ssl_certs_config = 'puppet:///modules/ssl/ca-certificates-global.conf'
+ } else {
+ $extra_ssl_certs_flags = ''
+ $ssl_certs_config = 'puppet:///modules/ssl/ca-certificates.conf'
+ }
+
+ file { '/etc/ssl/README':
+ mode => '0444',
+ source => 'puppet:///modules/ssl/README',
+ }
file { '/etc/ca-certificates.conf':
- content => "# This file is under puppet control\n# Only debian.org service certs are trusted, see /etc/ssl/certs/README",
+ source => $ssl_certs_config,
notify => Exec['refresh_normal_hashes'],
}
file { '/etc/ca-certificates-debian.conf':
mode => '0444',
- content => "# This file is under puppet control\n# Only the CAs for debian.org are trusted, see /etc/ssl/ca-debian/README\nmozilla/AddTrust_External_Root.crt",
+ source => 'puppet:///modules/ssl/ca-certificates.conf',
notify => Exec['refresh_ca_debian_hashes'],
}
file { '/etc/ca-certificates-global.conf':
- content => "# This file is under puppet control\n# All CAs are trusted, see /etc/ssl/ca-global/README",
+ source => 'puppet:///modules/ssl/ca-certificates-global.conf',
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/servicecerts':
- ensure => link,
- purge => true,
- force => true,
- target => '/usr/local/share/ca-certificates/debian.org',
- notify => Exec['retire_debian_links'],
+ ensure => absent,
}
file { '/usr/local/share/ca-certificates/debian.org':
- ensure => directory,
- source => 'puppet:///modules/ssl/servicecerts/',
- mode => '0644', # this works; otherwise all files are +x
+ ensure => absent,
purge => true,
recurse => true,
force => true,
- notify => Exec['refresh_normal_hashes'],
+ notify => [ Exec['refresh_normal_hashes'], Exec['refresh_ca_global_hashes'] ],
}
file { '/etc/ssl/certs/README':
- mode => '0444',
- source => 'puppet:///modules/ssl/README.certs',
+ ensure => absent,
}
file { '/etc/ssl/ca-debian':
ensure => directory,
mode => '0755',
}
file { '/etc/ssl/ca-debian/README':
- mode => '0444',
- source => 'puppet:///modules/ssl/README.ca-debian',
+ ensure => absent,
}
file { '/etc/ssl/ca-global':
ensure => directory,
mode => '0755',
}
file { '/etc/ssl/ca-global/README':
- mode => '0444',
- source => 'puppet:///modules/ssl/README.ca-global',
+ ensure => absent,
}
file { '/etc/ssl/debian':
ensure => directory,
ensure => directory,
mode => '0755',
}
- file { '/etc/ssl/debian/keys':
- ensure => directory,
- mode => '0750',
- group => ssl-cert,
- require => Package['ssl-cert'],
- }
file { '/etc/ssl/debian/certs/thishost.crt':
- source => "puppet:///modules/ssl/clientcerts/${::fqdn}.client.crt",
+ content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/" + @fqdn + ".client.crt") %>'),
notify => Exec['refresh_debian_hashes'],
}
- file { '/etc/ssl/debian/keys/thishost.key':
- source => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
- mode => '0440',
- group => ssl-cert,
- require => Package['ssl-cert'],
- }
file { '/etc/ssl/debian/certs/ca.crt':
- source => 'puppet:///modules/ssl/clientcerts/ca.crt',
+ content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/ca.crt") %>'),
notify => Exec['refresh_debian_hashes'],
}
file { '/etc/ssl/debian/crls/ca.crl':
- source => 'puppet:///modules/ssl/clientcerts/ca.crl',
+ content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/ca.crl") %>'),
}
file { '/etc/ssl/debian/certs/thishost-server.crt':
- source => "puppet:///modules/exim/certs/${::fqdn}.crt",
+ content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".crt") %>'),
notify => Exec['refresh_debian_hashes'],
}
+
+ file { '/etc/ssl/debian/keys/thishost.key':
+ ensure => absent,
+ }
file { '/etc/ssl/debian/keys/thishost-server.key':
- source => "puppet:///modules/exim/certs/${::fqdn}.key",
+ ensure => absent,
+ }
+ file { '/etc/ssl/debian/keys':
+ ensure => absent,
+ force => true,
+ }
+ file { '/etc/ssl/private/thishost.key':
+ content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_clientcerts_dir"]) + "/" + @fqdn + ".key") %>'),
+ mode => '0440',
+ group => ssl-cert,
+ require => Package['ssl-cert'],
+ }
+ file { '/etc/ssl/private/thishost-server.key':
+ content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".key") %>'),
mode => '0440',
group => ssl-cert,
require => Package['ssl-cert'],
}
- file { '/usr/local/sbin/update-ca-certificates-dsa':
- mode => '0555',
- source => 'puppet:///modules/ssl/update-ca-certificates-dsa',
+ $updatecacertsdsa = '/usr/local/sbin/update-ca-certificates-dsa'
+ if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+ file { $updatecacertsdsa:
+ ensure => absent,
+ }
+ $updatecacerts = '/usr/sbin/update-ca-certificates'
+ } else {
+ file { $updatecacertsdsa:
+ mode => '0555',
+ source => 'puppet:///modules/ssl/update-ca-certificates-dsa',
+ }
+ $updatecacerts = $updatecacertsdsa
}
- exec { 'retire_debian_links':
- command => 'find -lname "../servicecerts/*" -exec rm {} +',
- cwd => '/etc/ssl/certs',
- refreshonly => true,
- notify => Exec['refresh_normal_hashes'],
+ 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,
require => Package['openssl'],
}
+
exec { 'refresh_normal_hashes':
# NOTE 1: always use update-ca-certificates to manage hashes in
# /etc/ssl/certs otherwise /etc/ssl/ca-certificates.crt will
# get a hash overriding the hash that would have been generated
# for another certificate ... which is problem, comrade
# NOTE 2: always ask update-ca-certificates to freshen (-f) the links
- command => '/usr/sbin/update-ca-certificates -f',
+ command => "/usr/sbin/update-ca-certificates --fresh${extra_ssl_certs_flags}",
refreshonly => true,
require => Package['ca-certificates'],
}
exec { 'refresh_ca_debian_hashes':
- command => '/usr/local/sbin/update-ca-certificates-dsa --fresh --certsconf /etc/ca-certificates-debian.conf --localcertsdir /dev/null --etccertsdir /etc/ssl/ca-debian --hooksdir /dev/null',
+ command => "${updatecacerts} --fresh --certsconf /etc/ca-certificates-debian.conf --localcertsdir /dev/null --etccertsdir /etc/ssl/ca-debian --hooksdir /dev/null",
refreshonly => true,
require => [
Package['ca-certificates'],
File['/etc/ssl/ca-debian'],
File['/etc/ca-certificates-debian.conf'],
- File['/usr/local/sbin/update-ca-certificates-dsa'],
+ File[$updatecacertsdsa],
]
}
exec { 'refresh_ca_global_hashes':
- command => '/usr/local/sbin/update-ca-certificates-dsa --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null',
+ command => "${updatecacerts} --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null",
refreshonly => true,
require => [
Package['ca-certificates'],
File['/etc/ssl/ca-global'],
File['/etc/ca-certificates-global.conf'],
- File['/usr/local/sbin/update-ca-certificates-dsa'],
+ File[$updatecacertsdsa],
]
}
projects / mirror / dsa-puppet.git / blobdiff