Added $config_dir variable

puppetlabs · Mar 9, 2015 · 3b9c124 · 3b9c124
1 parent ed5c6aa
commit 3b9c124
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -8,17 +8,16 @@
       group  => ntp,
       mode   => '0640',
     }
+  }
 
-    $directory = dirname($keys_file)
-    if $directory =~ /^\/.+\/.+$/ {
-      file { $directory:
+  if $config_dir {
+      file { $config_dir:
         ensure  => directory,
         owner   => 0,
-        group   => 0,
+        group   => ntp,
         mode    => '0640',
-        recurse => true,
+        recurse => false,
       }
-    }
   }
 
   file { $config:

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -2,6 +2,7 @@
   $autoupdate        = $ntp::params::autoupdate,
   $broadcastclient   = $ntp::params::broadcastclient,
   $config            = $ntp::params::config,
+  $config_dir        = $ntp::params::config_dir,
   $config_template   = $ntp::params::config_template,
   $disable_auth      = $ntp::params::disable_auth,
   $disable_monitor   = $ntp::params::disable_monitor,