From 2b55b3be96d6f8813db43a3e1a1ab750fbcc8688 Mon Sep 17 00:00:00 2001 From: Steffen Zieger Date: Mon, 24 Sep 2012 12:54:01 +0200 Subject: fix freebsd package name --- manifests/params.pp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'manifests/params.pp') diff --git a/manifests/params.pp b/manifests/params.pp index e2024c2..8deb7d2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,6 +1,6 @@ class rsyslog::params { - case $::operatingsystem { - ubuntu, debian: { + case $::osfamily { + debian: { $rsyslog_package_name = 'rsyslog' $relp_package_name = 'rsyslog-relp' $package_status = 'latest' @@ -39,8 +39,8 @@ class rsyslog::params { $server_conf = "${rsyslog_d}server.conf" } freebsd: { - $rsyslog_package_name = 'rsyslog5' - $relp_package_name = 'rsyslog5-relp' + $rsyslog_package_name = 'sysutils/rsyslog5' + $relp_package_name = 'sysutils/rsyslog5-relp' $package_status = 'present' $rsyslog_d = '/etc/syslog.d/' $rsyslog_conf = '/etc/syslog.conf' @@ -57,11 +57,12 @@ class rsyslog::params { $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" } - - default: { - fail("Unsupported platform: ${::operatingsystem}") + case $::operatingsystem { + default: { + fail("Unsupported platform: ${::operatingsystem}") + } + } } } - } -- cgit v1.2.3 From 44cab6234a0b885677f68f3c162a75ef2dd6f3ab Mon Sep 17 00:00:00 2001 From: Steffen Zieger Date: Mon, 24 Sep 2012 16:12:08 +0200 Subject: reset rsyslog package name on freebsd --- manifests/params.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/params.pp') diff --git a/manifests/params.pp b/manifests/params.pp index 8deb7d2..edf0bc1 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -19,7 +19,7 @@ class rsyslog::params { $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" } - redhat, centos, fedora: { + redhat: { $rsyslog_package_name = 'rsyslog' $relp_package_name = 'rsyslog-relp' $package_status = 'latest' @@ -39,8 +39,8 @@ class rsyslog::params { $server_conf = "${rsyslog_d}server.conf" } freebsd: { - $rsyslog_package_name = 'sysutils/rsyslog5' - $relp_package_name = 'sysutils/rsyslog5-relp' + $rsyslog_package_name = 'rsyslog5' + $relp_package_name = 'rsyslog5-relp' $package_status = 'present' $rsyslog_d = '/etc/syslog.d/' $rsyslog_conf = '/etc/syslog.conf' -- cgit v1.2.3