Merge remote-tracking branch 'shared/master' into leap_master

4 files changed, 19 insertions, 9 deletions

diff --git a/manifests/centos.pp b/manifests/centos.pp
index b9a326a..3b0a6e2 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -18,7 +18,7 @@ class stunnel::centos inherits stunnel::linux {
 
   Service['stunnel']{
     hasstatus => true,
-    require => [ User['stunnel'], File['/etc/init.d/stunnel'] ]
+    require   => [ User['stunnel'], File['/etc/init.d/stunnel'] ]
   }
 
   file { '/etc/stunnel/stunnel.conf':
diff --git a/manifests/debian.pp b/manifests/debian.pp
index eb4d57a..bde1e21 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,10 +1,10 @@
 class stunnel::debian inherits stunnel::linux {
 
-  Package[stunnel] {
+  Package['stunnel'] {
     name => 'stunnel4',
   }
 
-  Service[stunnel] {
+  Service['stunnel'] {
     name => 'stunnel4',
     pattern => '/usr/bin/stunnel4',
   }
diff --git a/manifests/service.pp b/manifests/service.pp
index ade6752..8a98d8f 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -51,7 +51,7 @@ define stunnel::service (
   $timeoutconnect = false,
   $timeoutidle = false,
   $transparent = false,
-  $use_nagios = false,
+  $manage_nagios = false,
   $verify = false
 ) {
 
@@ -68,14 +68,12 @@ define stunnel::service (
       content => template('stunnel/service.conf.erb'),
       require => Package['stunnel'],
       notify  => Exec['refresh_stunnel'],
-      owner   => root,
+      owner   => 'root',
       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";
-    }
+  if $manage_nagios {
+    stunnel::service::nagios { $name: }
   }
 }
diff --git a/manifests/service/nagios.pp b/manifests/service/nagios.pp
new file mode 100644
index 0000000..578b417
--- /dev/null
+++ b/manifests/service/nagios.pp
@@ -0,0 +1,12 @@
+# Put a Nagios service check in place for a specific tunnel.
+#
+# The resource name will be used to point to the corresponding stunnel
+# configuration file.
+#
+define stunnel::service::nagios () {
+
+    nagios::service { "stunnel_${name}":
+      check_command => "nagios-stat-proc!/usr/bin/stunnel4 /etc/stunnel/${name}.conf!6!5!proc";
+    }
+
+}