diff --git a/manifests/eyaml.pp b/manifests/eyaml.pp index 5aa82f3..9adeeac 100644 --- a/manifests/eyaml.pp +++ b/manifests/eyaml.pp @@ -100,23 +100,25 @@ ensure => directory, } + $keysdir = dirname($_keysdir) + if ( $create_keys == true ) { exec { 'createkeys': user => $owner, - cwd => $confdir, + cwd => $keysdir, command => 'eyaml createkeys', path => $cmdpath, - creates => "${confdir}/keys/private_key.pkcs7.pem", - require => [ $hiera_package_depedencies, File["${confdir}/keys"] ], + creates => "${_keysdir}/private_key.pkcs7.pem", + require => [ $hiera_package_depedencies, File[$_keysdir] ], } - file { "${confdir}/keys/private_key.pkcs7.pem": + file { "${_keysdir}/private_key.pkcs7.pem": ensure => file, mode => '0600', require => Exec['createkeys'], } - file { "${confdir}/keys/public_key.pkcs7.pem": + file { "${_keysdir}/public_key.pkcs7.pem": ensure => file, mode => '0644', require => Exec['createkeys'],