From 3504405cf0b0be280d12434b83df648b7aab815b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 15 Jan 2013 23:28:08 +0100 Subject: [PATCH] Add support for ubuntu 12.10 status --- manifests/params.pp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 3dab676..d79b072 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -146,14 +146,7 @@ class postgresql::params( $bindir = "/usr/lib/postgresql/${version}/bin" $datadir = "/var/lib/postgresql/${version}/main" $confdir = "/etc/postgresql/${version}/main" - if($manage_package_repo) { - # The postgresql packages (official not distro) return a different - # string when checking status. - $service_status = "/etc/init.d/${service_name} status | /bin/egrep -q 'online'" - } else { - # And this is what the Debian/Ubuntu packages return. - $service_status = "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+'" - } + $service_status = "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'" } default: {