From 3b9c12496ba13895312a8ea3cd72dde905df7df5 Mon Sep 17 00:00:00 2001
From: sebastianschauenburg <s.schauenburg@gmail.com>
Date: Mon, 9 Mar 2015 08:22:16 +0100
Subject: [PATCH] Added $config_dir variable

---
 manifests/config.pp | 11 +++++------
 manifests/init.pp   |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 67806fd8..3f385544 100644
--- 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
index 14adf595..bc376361 100644
--- 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,