Working on getting ubuntu specs passing again

The service provider / status stuff got a little broken during
the refactors.  This should mostly fix it but there is still
one spec failing, and I will probably also refactor the
paths.pp and packages.pp into a single file together eventually.

Author: cprice404

manifests/params.pp

@@ -31,12 +31,6 @@
     fail "No value for postgres_default_version facter fact; it's possible that you don't have pluginsync enabled."
   }
 
-  case $::operatingsystem {
-    default: {
-      $service_provider = undef
-    }
-  }
-
   case $::osfamily {
     'RedHat': {
       $needs_initdb             = true
@@ -46,7 +40,6 @@
     'Debian': {
       $needs_initdb             = false
       $firewall_supported       = false
-      $service_status           = "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+'"
       # TODO: not exactly sure yet what the right thing to do for Debian/Ubuntu is.
       #$persist_firewall_command = '/sbin/iptables-save > /etc/iptables/rules.v4'
 

manifests/paths.pp

@@ -15,6 +15,12 @@
   include postgresql
 
   $version = $postgresql::version
+
+  case $::operatingsystem {
+    default: {
+      $service_provider = undef
+    }
+  }
 
   case $::osfamily {
     'RedHat': {

manifests/server.pp

@@ -17,22 +17,40 @@
 class postgresql::server (
   $package_name     = '',
   $package_ensure   = 'present',
-  $service_provider = $postgresql::params::service_provider,
-  $service_status   = $postgresql::params::service_status,
+  $service_name     = '',
+  $service_provider = '',
+  $service_status   = '',
   $config_hash      = {}
 ) inherits postgresql::params {
 
   require postgresql
   include postgresql::paths
+  include postgresql::packages
 
   if ! $package_name {
-    include postgresql::packages
     $package_name_real = $postgresql::packages::server_package_name
-  }
-  else {
+  } else {
     $package_name_real = $package_name
   }
 
+  if ! $service_name {
+      $service_name_real = $postgresql::paths::service_name
+  } else {
+      $service_name_real = $service_name
+  }
+
+  if ! $service_provider {
+      $service_provider_real = $postgresql::paths::service_provider
+  } else {
+      $service_provider_real = $service_provider
+  }
+
+  if ! $service_status {
+      $service_status_real = $postgresql::paths::service_status
+  } else {
+      $service_status_real = $service_status
+  }
+
   package { 'postgresql-server':
     ensure  => $package_ensure,
     name    => $package_name_real,
@@ -46,11 +64,11 @@
 
   service { 'postgresqld':
     ensure   => running,
-    name     => $postgresql::paths::service_name,
+    name     => $service_name_real,
     enable   => true,
     require  => Package['postgresql-server'],
-    provider => $service_provider,
-    status   => $service_status,
+    provider => $service_provider_real,
+    status   => $service_status_real,
   }
 
   if ($postgresql::params::needs_initdb) {