From 66ef82f35c83a1e156f5e6d97158e80177dd4ae1 Mon Sep 17 00:00:00 2001 From: Michael Moll Date: Fri, 19 Oct 2012 14:13:59 +0200 Subject: switch to the 'osfamily' fact --- manifests/init.pp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index d23f4a3..67125d4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -56,8 +56,9 @@ class ntp($servers='UNSET', fail('autoupdate parameter must be true or false') } - case $::operatingsystem { - debian, ubuntu: { + case $::osfamily { + Debian: { + $supported = true $pkg_name = [ 'ntp' ] $svc_name = 'ntp' $config = '/etc/ntp.conf' @@ -71,7 +72,8 @@ class ntp($servers='UNSET', $servers_real = $servers } } - centos, redhat, oel, linux, fedora, Amazon: { + RedHat: { + $supported = true $pkg_name = [ 'ntp' ] $svc_name = 'ntpd' $config = '/etc/ntp.conf' @@ -84,7 +86,8 @@ class ntp($servers='UNSET', $servers_real = $servers } } - freebsd: { + FreeBSD: { + $supported = true $pkg_name = ['.*/net/ntp'] $svc_name = 'ntpd' $config = '/etc/ntp.conf' @@ -99,7 +102,7 @@ class ntp($servers='UNSET', } } default: { - fail("The ${module_name} module is not supported on ${::operatingsystem}") + fail("The ${module_name} module is not supported on ${::osfamily} based systems") } } -- cgit v1.2.3 From 12ff9af2ca65af9954212a11536873ef21229991 Mon Sep 17 00:00:00 2001 From: Michael Moll Date: Fri, 19 Oct 2012 20:26:01 +0200 Subject: add SuSE support --- manifests/init.pp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index 67125d4..44e039b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -86,6 +86,21 @@ class ntp($servers='UNSET', $servers_real = $servers } } + SuSE: { + $supported = true + $pkg_name = [ 'ntp' ] + $svc_name = 'ntp' + $config = '/etc/ntp.conf' + $config_tpl = 'ntp.conf.suse.erb' + if ($servers == 'UNSET') { + $servers_real = [ '0.opensuse.pool.ntp.org', + '1.opensuse.pool.ntp.org', + '2.opensuse.pool.ntp.org', + '3.opensuse.pool.ntp.org', ] + } else { + $servers_real = $servers + } + } FreeBSD: { $supported = true $pkg_name = ['.*/net/ntp'] @@ -102,13 +117,13 @@ class ntp($servers='UNSET', } } default: { - fail("The ${module_name} module is not supported on ${::osfamily} based systems") + fail("The ${module_name} module is not supported on ${::osfamily} based systems") } } package { 'ntp': - name => $pkg_name, ensure => $package_ensure, + name => $pkg_name, } file { $config: -- cgit v1.2.3