ensure => installed,
}
+ 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 => 'puppet:///modules/ssl/ca-certificates.conf',
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-debian.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'],
}
notify => Exec['refresh_normal_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-debian/README':
- mode => '0444',
- source => 'puppet:///modules/ssl/README.ca-global',
+ file { '/etc/ssl/ca-global/README':
+ 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",
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',
notify => Exec['refresh_debian_hashes'],
source => "puppet:///modules/exim/certs/${::fqdn}.crt",
notify => Exec['refresh_debian_hashes'],
}
+
+ file { '/etc/ssl/debian/keys/thishost.key':
+ ensure => absent,
+ }
file { '/etc/ssl/debian/keys/thishost-server.key':
+ ensure => absent,
+ }
+ file { '/etc/ssl/debian/keys':
+ ensure => absent,
+ }
+ file { '/etc/ssl/private/thishost.key':
+ source => "puppet:///modules/ssl/clientcerts/${::fqdn}.key",
+ mode => '0440',
+ group => ssl-cert,
+ require => Package['ssl-cert'],
+ }
+ file { '/etc/ssl/private/thishost-server.key':
source => "puppet:///modules/exim/certs/${::fqdn}.key",
mode => '0440',
group => ssl-cert,