From 8c1b10374bf8b6fd75bc0110b31d91badc84a981 Mon Sep 17 00:00:00 2001
From: Tom De Vylder <tom@penumbra.be>
Date: Tue, 27 Nov 2012 17:30:46 +0100
Subject: Code smell

---
 manifests/service.pp | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

(limited to 'manifests/service.pp')

diff --git a/manifests/service.pp b/manifests/service.pp
index e012fe6..9c963bd 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -2,32 +2,21 @@
 #
 class nfs::service {
   if $::nfs::server {
+    Service {
+      require => Class['::nfs::config'],
+    }
 
-    if $::osfamily == 'RedHat' {
-
-      service { 'rpcbind':
-        ensure    => $::nfs::service_ensure,
-        enable    => $::nfs::service_enable,
-        hasstatus => $::nfs::service_hasstatus,
-        require   => Class['::nfs::config'];
-      }
-
-      service { $::nfs::service_name:
-        ensure    => $::nfs::service_ensure,
-        enable    => $::nfs::service_enable,
-        hasstatus => $::nfs::service_hasstatus,
-        require   => [ Class['::nfs::config'], Service['rpcbind'], ];
-      }
-
-    } else {
-
-      service { $::nfs::service_name:
-        ensure    => $::nfs::service_ensure,
-        enable    => $::nfs::service_enable,
-        hasstatus => $::nfs::service_hasstatus,
-        require   => Class['::nfs::config'];
-      }
+    service { $::nfs::service_rpc:
+      ensure    => $::nfs::service_ensure,
+      enable    => $::nfs::service_enable,
+      hasstatus => $::nfs::service_hasstatus;
+    }
 
+    service { $::nfs::service_name:
+      ensure    => $::nfs::service_ensure,
+      enable    => $::nfs::service_enable,
+      hasstatus => $::nfs::service_hasstatus,
+      require   => Service[$::nfs::service_rpc];
     }
   }
 }
-- 
cgit v1.2.3