projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also remove /usr/local/share/ca-certificates/debian.org
[mirror/dsa-puppet.git]
/
modules
/
ssl
/
manifests
/
init.pp
diff --git
a/modules/ssl/manifests/init.pp
b/modules/ssl/manifests/init.pp
index
6aa1948
..
744cb46
100644
(file)
--- a/
modules/ssl/manifests/init.pp
+++ b/
modules/ssl/manifests/init.pp
@@
-51,17
+51,11
@@
class ssl {
}
file { '/etc/ssl/servicecerts':
}
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':
}
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,
purge => true,
recurse => true,
force => true,
@@
-101,18
+95,18
@@
class ssl {
mode => '0755',
}
file { '/etc/ssl/debian/certs/thishost.crt':
mode => '0755',
}
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/certs/ca.crt':
notify => Exec['refresh_debian_hashes'],
}
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':
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':
}
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'],
}
notify => Exec['refresh_debian_hashes'],
}
@@
-127,13
+121,13
@@
class ssl {
force => true,
}
file { '/etc/ssl/private/thishost.key':
force => true,
}
file { '/etc/ssl/private/thishost.key':
-
source => "puppet:///modules/ssl/clientcerts/${::fqdn}.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':
mode => '0440',
group => ssl-cert,
require => Package['ssl-cert'],
}
file { '/etc/ssl/private/thishost-server.key':
-
source => "puppet:///modules/exim/certs/${::fqdn}.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'],
mode => '0440',
group => ssl-cert,
require => Package['ssl-cert'],
@@
-153,12
+147,6
@@
class ssl {
$updatecacerts = $updatecacertsdsa
}
$updatecacerts = $updatecacertsdsa
}
- exec { 'retire_debian_links':
- command => 'find -lname "../servicecerts/*" -exec rm {} +',
- cwd => '/etc/ssl/certs',
- refreshonly => true,
- notify => Exec['refresh_normal_hashes'],
- }
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,