From 0bec75e40e5aa4458c960242298ab455fcffc88e Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 13:18:26 -0400
Subject: switch to parameterized classes, changing the variable names as
 appropriate to remove the redundant stunnel_ prefix

---
 manifests/debian.pp | 12 ++++++------
 manifests/init.pp   | 15 +++++----------
 manifests/linux.pp  |  4 ++--
 3 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'manifests')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index a480a2c..156ef75 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -11,16 +11,16 @@ class stunnel::debian inherits stunnel::linux {
 
   # make the /etc/default/stunnel ENABLED configurable with a variable
   # and default to on
-  case $stunnel_startboot {
-    '': { $stunnel_startboot = '1' }
-    default: { $stunnel_startboot = '1' }
+  case $startboot {
+    '': { $startboot = '1' }
+    default: { $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 = '' }
+  case $default_extra {
+    '': { $default_extra = '' }
+    default: { $default_extra = '' }
   }
 
   file { '/etc/default/stunnel4':
diff --git a/manifests/init.pp b/manifests/init.pp
index b1437d2..270540d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,17 +17,12 @@
 
 # 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 )
+{
   case $::operatingsystem {
-    debian: { include stunnel::debian }
-    centos: { include stunnel::centos }
-    default: { include stunnel::default }
+    debian: { class { 'stunnel::debian': } }
+    centos: { class {  'stunnel::centos': } }
+    default: { class { 'stunnel::default': } }
   }
 
   if $use_nagios {
diff --git a/manifests/linux.pp b/manifests/linux.pp
index b4b99c6..eb1b10a 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,7 +1,7 @@
 class stunnel::linux inherits stunnel::base {
 
-  if $stunnel_ensure_version == '' { $stunnel_ensure_version = 'installed' }
+  if $ensure_version == '' { $ensure_version = 'installed' }
   package { 'stunnel':
-    ensure => $stunnel_ensure_version
+    ensure => $ensure_version
   }
 }
-- 
cgit v1.2.3


From 724bc04aa9ece40fe2c54979afffdf53c5564758 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 13:19:05 -0400
Subject: move the $use_nagios check into the stunnel::service define, where it
 is more useful for creating accurate nagios-statd-proc checks for the correct
 stunnel names

---
 manifests/init.pp    | 11 -----------
 manifests/service.pp |  7 +++++++
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 270540d..1204909 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,15 +24,4 @@ class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra )
     centos: { class {  'stunnel::centos': } }
     default: { class { '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';
-        }
-      }
-    }
-  }
 }
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";
+    }
+  }
 }
-- 
cgit v1.2.3


From fb9fcfaa8bb27cb8ceeaa2090ee28c737c540e40 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 13:53:05 -0400
Subject: qualify variables

---
 manifests/debian.pp | 12 ++++++------
 manifests/linux.pp  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'manifests')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index 156ef75..ee2a2f1 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -11,16 +11,16 @@ class stunnel::debian inherits stunnel::linux {
 
   # make the /etc/default/stunnel ENABLED configurable with a variable
   # and default to on
-  case $startboot {
-    '': { $startboot = '1' }
-    default: { $startboot = '1' }
+  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 $default_extra {
-    '': { $default_extra = '' }
-    default: { $default_extra = '' }
+  case $stunnel::default_extra {
+    '': { $stunnel::default_extra = '' }
+    default: { $stunnel::default_extra = '' }
   }
 
   file { '/etc/default/stunnel4':
diff --git a/manifests/linux.pp b/manifests/linux.pp
index eb1b10a..972f21c 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,7 +1,7 @@
 class stunnel::linux inherits stunnel::base {
 
-  if $ensure_version == '' { $ensure_version = 'installed' }
+  if $stunnel::ensure_version == '' { $stunnel::ensure_version = 'installed' }
   package { 'stunnel':
-    ensure => $ensure_version
+    ensure => $stunnel::ensure_version
   }
 }
-- 
cgit v1.2.3


From b53d574250598178af298c59be957693eaaddb22 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 13:59:31 -0400
Subject: remove variable defaults, they are handled by the paramterization of
 the class make sure template variables are properly looked up.

---
 manifests/debian.pp | 14 --------------
 manifests/init.pp   |  1 +
 manifests/linux.pp  |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'manifests')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index ee2a2f1..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 1204909..f7f72b8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,6 +19,7 @@
 
 class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra )
 {
+
   case $::operatingsystem {
     debian: { class { 'stunnel::debian': } }
     centos: { class {  'stunnel::centos': } }
diff --git a/manifests/linux.pp b/manifests/linux.pp
index 972f21c..a4a926e 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,6 +1,5 @@
 class stunnel::linux inherits stunnel::base {
 
-  if $stunnel::ensure_version == '' { $stunnel::ensure_version = 'installed' }
   package { 'stunnel':
     ensure => $stunnel::ensure_version
   }
-- 
cgit v1.2.3


From c3d3f81b98542b94a013440c81b0942c9c4a82cf Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 14:58:29 -0400
Subject: set an empty default for the $default_extra parameter

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index f7f72b8..a08fb0a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,7 @@
 
 # TODO: warn on cert/key issues, fail on false accept?
 
-class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra )
+class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '' )
 {
 
   case $::operatingsystem {
-- 
cgit v1.2.3


From d7acd567ace308049848733d8f1c801b955974a8 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 15:01:44 -0400
Subject: fix merge conflict error causing the $cluster parameter to go missing

---
 manifests/centos.pp | 2 +-
 manifests/init.pp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/centos.pp b/manifests/centos.pp
index 39f18c7..19a4684 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/init.pp b/manifests/init.pp
index a08fb0a..872e5f2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,7 @@
 
 # TODO: warn on cert/key issues, fail on false accept?
 
-class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '' )
+class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '', $cluster = '' )
 {
 
   case $::operatingsystem {
-- 
cgit v1.2.3


From 1e6fbdf7f1f7e381ef01170eab96727377abe3b6 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 15:02:16 -0400
Subject: format the class variables

---
 manifests/init.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 872e5f2..a176bf8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,11 @@
 
 # TODO: warn on cert/key issues, fail on false accept?
 
-class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '', $cluster = '' )
+class stunnel (
+  $ensure_version = 'present',
+  $startboot      = '1',
+  $default_extra  = '',
+  $cluster        = '' )
 {
 
   case $::operatingsystem {
-- 
cgit v1.2.3