Merge remote-tracking branch 'leap/parameterized_classes'

Conflicts:
	manifests/init.pp

5 files changed, 18 insertions, 37 deletions

diff --git a/manifests/centos.pp b/manifests/centos.pp
index 4283cb0..b9a326a 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -23,7 +23,7 @@ class stunnel::centos inherits stunnel::linux {
 
   file { '/etc/stunnel/stunnel.conf':
     source  => [ "puppet:///modules/site-stunnel/${::fqdn}/stunnel.conf",
-                 "puppet:///modules/site-stunnel/${stunnel_cluster}/stunnel.conf",
+                 "puppet:///modules/site-stunnel/${stunnel::cluster}/stunnel.conf",
                  'puppet:///modules/site-stunnel/stunnel.conf',
                  "puppet:///modules/stunnel/${::operatingsystem}/stunnel.conf" ],
     require => Package['stunnel'],
diff --git a/manifests/debian.pp b/manifests/debian.pp
index a480a2c..eb4d57a 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -9,20 +9,6 @@ class stunnel::debian inherits stunnel::linux {
     pattern => '/usr/bin/stunnel4',
   }
 
-  # make the /etc/default/stunnel ENABLED configurable with a variable
-  # and default to on
-  case $stunnel_startboot {
-    '': { $stunnel_startboot = '1' }
-    default: { $stunnel_startboot = '1' }
-  }
-
-  # make the /etc/default/stunnel extra configurable with a variable
-  # and default to adding nothing to the default file
-  case $stunnel_default_extra {
-    '': { $stunnel_default_extra = '' }
-    default: { $stunnel_default_extra = '' }
-  }
-
   file { '/etc/default/stunnel4':
     content => template('stunnel/Debian/default'),
     require => Package['stunnel4'],
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': } }
   }
 }
diff --git a/manifests/linux.pp b/manifests/linux.pp
index b4b99c6..a4a926e 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,7 +1,6 @@
 class stunnel::linux inherits stunnel::base {
 
-  if $stunnel_ensure_version == '' { $stunnel_ensure_version = 'installed' }
   package { 'stunnel':
-    ensure => $stunnel_ensure_version
+    ensure => $stunnel::ensure_version
   }
 }
diff --git a/manifests/service.pp b/manifests/service.pp
index b925d00..fd64f9b 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -51,6 +51,7 @@ define stunnel::service (
   $timeoutconnect = false,
   $timeoutidle = false,
   $transparent = false,
+  $use_nagios = false,
   $verify = false
 ) {
 
@@ -66,4 +67,10 @@ define stunnel::service (
     group   => 0,
     mode    => '0600';
   }
+
+  if $use_nagios {
+    nagios::service { "stunnel_${name}":
+      check_command => "nagios-stat-proc!/usr/bin/stunnel4 /etc/stunnel/${name}.conf!6!5!proc";
+    }
+  }
 }