diff --git a/lib/puppet/parser/functions/validate_rd_policy.rb b/lib/puppet/parser/functions/validate_rd_policy.rb index b109be897..63eac72f1 100644 --- a/lib/puppet/parser/functions/validate_rd_policy.rb +++ b/lib/puppet/parser/functions/validate_rd_policy.rb @@ -1,4 +1,4 @@ -require 'puppetx/rundeck/acl' +require File.expand_path('../../../../puppetx/rundeck/acl', __FILE__) # Validates the rundeck ACL policies # Usage: diff --git a/manifests/config/global/ssl.pp b/manifests/config/global/ssl.pp index 6bd2cbac5..c01cc01a9 100644 --- a/manifests/config/global/ssl.pp +++ b/manifests/config/global/ssl.pp @@ -20,8 +20,17 @@ $properties_file = "${properties_dir}/ssl/ssl.properties" - ensure_resource('file', $properties_dir, {'ensure' => 'directory', 'owner' => $user, 'group' => $group} ) - ensure_resource('file', "${properties_dir}/ssl", {'ensure' => 'directory', 'owner' => $user, 'group' => $group, 'require' => File[$properties_dir]} ) + ensure_resource('file', $properties_dir, { + 'ensure' => 'directory', + 'owner' => $user, + 'group' => $group + } ) + ensure_resource('file', "${properties_dir}/ssl", { + 'ensure' => 'directory', + 'owner' => $user, + 'group' => $group, + 'require' => File[$properties_dir] + } ) Ini_setting { notify => Service[$service_name], diff --git a/manifests/config/resource_source.pp b/manifests/config/resource_source.pp index 83d0f5a79..81e2ead45 100644 --- a/manifests/config/resource_source.pp +++ b/manifests/config/resource_source.pp @@ -102,8 +102,17 @@ validate_re($user, '[a-zA-Z0-9]{3,}') validate_re($group, '[a-zA-Z0-9]{3,}') - ensure_resource('file', "${projects_dir}/${project_name}", {'ensure' => 'directory', 'owner' => $user, 'group' => $group} ) - ensure_resource('file', "${projects_dir}/${project_name}/etc", {'ensure' => 'directory', 'owner' => $user, 'group' => $group, 'require' => File["${projects_dir}/${project_name}"]} ) + ensure_resource('file', "${projects_dir}/${project_name}", { + 'ensure' => 'directory', + 'owner' => $user, + 'group' => $group + } ) + ensure_resource('file', "${projects_dir}/${project_name}/etc", { + 'ensure' => 'directory', + 'owner' => $user, + 'group' => $group, + 'require' => File["${projects_dir}/${project_name}"] + } ) $properties_dir = "${projects_dir}/${project_name}/etc" $properties_file = "${properties_dir}/project.properties"