Merge remote-tracking branch 'leap/parameterized_classes'

Conflicts:
	manifests/init.pp

1 files changed, 9 insertions, 20 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index b398c54..a176bf8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,27 +17,16 @@
 
 # TODO: warn on cert/key issues, fail on false accept?
 
-class stunnel {
-
-  case $stunnel_ensure_version {
-    '': { $stunnel_ensure_version = 'present' }
-    default: { $stunnel_ensure_version = 'present' }
-  }
+class stunnel (
+  $ensure_version = 'present',
+  $startboot      = '1',
+  $default_extra  = '',
+  $cluster        = '' )
+{
 
   case $::operatingsystem {
-    debian: { include stunnel::debian }
-    centos: { include stunnel::centos }
-    default: { include stunnel::default }
-  }
-
-  if $use_nagios {
-    case $nagios_stunnel_procs {
-      false: { info("We aren't doing nagios checks for stunnel on ${::fqdn}" ) }
-      default: {
-        nagios::service { 'stunnel':
-          check_command => 'nagios-stat-proc!/usr/bin/stunnel4!6!5!proc';
-        }
-      }
-    }
+    debian: { class { 'stunnel::debian': } }
+    centos: { class {  'stunnel::centos': } }
+    default: { class { 'stunnel::default': } }
   }
 }