Add new parameters to allow more flexible configuration.

`driftfile` [String]: Allows the setting of the driftfile location.
`keys_enable` [Boolean]: Should the ntp keys option be enabled?
`keys_file` [String]: Where are the keys stored?
`keys_trusted` [Array]: List of keys to trust.
`keys_requestkey` [String]: Request key to use.
`keys_controlkey` [String]: Control key to use.

If keys_enable is set then the directory that keysfile is stored in is
created (recursively).  Currently we don't manage the keys file but that
is an option to be added.

1 files changed, 26 insertions, 15 deletions

diff --git a/manifests/params.pp b/manifests/params.pp
index 45551a8..9e91cce 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,22 +1,28 @@
 class ntp::params {
 
-  $autoupdate     = false
-  $package_ensure = 'present'
-  $restrict       = true
-  $service_enable = true
-  $service_ensure = 'running'
-  $service_manage = true
+  $autoupdate      = false
+  $config_template = 'ntp/ntp.conf.erb'
+  $keys_enable     = false
+  $keys_controlkey = ''
+  $keys_requestkey = ''
+  $keys_trusted    = []
+  $package_ensure  = 'present'
+  $restrict        = true
+  $service_enable  = true
+  $service_ensure  = 'running'
+  $service_manage  = true
 
   # On virtual machines allow large clock skews.
-  $panic = $::is_virtual ? {
-    'true'  => false,
+  $panic = str2bool($::is_virtual) ? {
+    true    => false,
     default => true,
   }
 
   case $::osfamily {
     'Debian': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp/ntp.conf.debian.erb'
+      $keysfile        = '/etc/ntp/keys'
+      $driftfile       = '/var/lib/ntp/drift'
       $package_name    = [ 'ntp' ]
       $service_name    = 'ntp'
       $servers         = [
@@ -28,7 +34,8 @@ class ntp::params {
     }
     'RedHat': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp/ntp.conf.el.erb'
+      $driftfile       = '/var/lib/ntp/drift'
+      $keysfile        = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
       $service_name    = 'ntpd'
       $servers         = [
@@ -39,7 +46,8 @@ class ntp::params {
     }
     'SuSE': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp/ntp.conf.suse.erb'
+      $driftfile       = '/var/lib/ntp/drift/ntp.drift'
+      $keysfile        = '/etc/ntp/keys'
       $package_name    = [ 'ntp' ]
       $service_name    = 'ntp'
       $servers         = [
@@ -51,7 +59,8 @@ class ntp::params {
     }
     'FreeBSD': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp/ntp.conf.freebsd.erb'
+      $driftfile       = '/var/db/ntpd.drift'
+      $keysfile        = '/etc/ntp/keys'
       $package_name    = ['net/ntp']
       $service_name    = 'ntpd'
       $servers         = [
@@ -63,8 +72,9 @@ class ntp::params {
     }
     'Archlinux': {
       $config          = '/etc/ntp.conf'
-      $config_template = 'ntp/ntp.conf.archlinux.erb'
-      $package_name    = ['ntp']
+      $driftfile       = '/var/lib/ntp/drift'
+      $keysfile        = '/etc/ntp/keys'
+      $package_name    = [ 'ntp' ]
       $service_name    = 'ntpd'
       $servers         = [
         '0.pool.ntp.org',
@@ -77,7 +87,8 @@ class ntp::params {
       case $::operatingsystem {
         'Gentoo': {
           $config          = '/etc/ntp.conf'
-          $config_template = 'ntp/ntp.conf.gentoo.erb'
+          $driftfile       = '/var/lib/ntp/drift'
+          $keysfile        = '/etc/ntp/keys'
           $package_name    = ['net-misc/ntp']
           $service_name    = 'ntpd'
           $servers         = [