From dc0efbfacf6f7135e0437495e6f69f971da6285d Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 5 Jul 2013 18:19:12 -0400
Subject: Ensure that users can pass in templates from outside of the ntp
 module.

---
 manifests/config.pp |  2 +-
 manifests/params.pp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'manifests')

diff --git a/manifests/config.pp b/manifests/config.pp
index 30a46aa..3295548 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -10,7 +10,7 @@ class ntp::config(
     owner   => 0,
     group   => 0,
     mode    => '0644',
-    content => template("ntp/${config_template}"),
+    content => template($config_template),
   }
 
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index ba9a540..9d20a13 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -8,7 +8,7 @@ class ntp::params() {
   case $::osfamily {
     'Debian': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp.conf.debian.erb'
+      $config_template = 'ntp/ntp.conf.debian.erb'
       $package_name    = [ 'ntp' ]
       $service_name    = 'ntp'
       $servers         = [
@@ -20,7 +20,7 @@ class ntp::params() {
     }
     'RedHat': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp.conf.el.erb'
+      $config_template = 'ntp/ntp.conf.el.erb'
       $package_name    = [ 'ntp' ]
       $service_name    = 'ntpd'
       $servers         = [
@@ -31,7 +31,7 @@ class ntp::params() {
     }
     'SuSE': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp.conf.suse.erb'
+      $config_template = 'ntp/ntp.conf.suse.erb'
       $package_name    = [ 'ntp' ]
       $service_name    = 'ntp'
       $servers         = [
@@ -43,7 +43,7 @@ class ntp::params() {
     }
     'FreeBSD': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp.conf.freebsd.erb'
+      $config_template = 'ntp/ntp.conf.freebsd.erb'
       $package_name    = ['net/ntp']
       $service_name    = 'ntpd'
       $servers         = [
@@ -58,7 +58,7 @@ class ntp::params() {
       case $::operatingsystem {
         'Archlinux': {
           $config = '/etc/ntp.conf'
-          $config_template = 'ntp.conf.archlinux.erb'
+          $config_template = 'ntp/ntp.conf.archlinux.erb'
           $package_name = ['ntp']
           $service_name = 'ntpd'
           $servers = [  
-- 
cgit v1.2.3