Merge pull request #201 from igalic/require

fix(validate_rd_policy) expand relative path for require
voxpupuli · Mar 11, 2016 · 647ea85 · 647ea85
2 parents e90dab8 + 0ebddde
commit 647ea85
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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"