Merge build 42 into master

README.md

@@ -29,6 +29,7 @@
 - manage required files and directories including selinux context
 - manage service
 - (optional) manage firewall
+- (optional) manage nagios monitoring for `sshd`
 
 ## Adding custom configurations
 

doc/file.README.html

@@ -104,6 +104,8 @@
 <p>manage service</p>
 </li><li>
 <p>(optional) manage firewall</p>
+</li><li>
+<p>(optional) manage nagios monitoring for <code>sshd</code></p>
 </li></ul>
 
 <h2 id="label-Adding+custom+configurations">Adding custom configurations</h2>

doc/index.html

@@ -104,6 +104,8 @@
 <p>manage service</p>
 </li><li>
 <p>(optional) manage firewall</p>
+</li><li>
+<p>(optional) manage nagios monitoring for <code>sshd</code></p>
 </li></ul>
 
 <h2 id="label-Adding+custom+configurations">Adding custom configurations</h2>

doc/puppet_classes/confdroid_ssh_3A_3Amonitoring_3A_3Atarget.html

@@ -125,12 +125,12 @@
 class confdroid_ssh::monitoring::target (
 ) inherits confdroid_ssh::params {
   if $ssh_manage_nagios == true {
-    @@nagios_service { "check_ssh_${fqdn}":
-      check_command       => "check_nrpe!check_ssh!${ssh_procs_allowed}!sshd",
+    @@nagios_service { "check_sshd_${fqdn}":
+      check_command       => "check_nrpe!check_sshd!${ssh_procs_allowed}!sshd",
       use                 => 'generic-service',
       host_name           => $fqdn,
       notification_period => '24x7',
-      service_description => "${fqdn}_check_ssh",
+      service_description => "${fqdn}_check_sshd",
       target              => $ssh_target_service,
       owner               => 'nagios',
       group               => 'nagios',

manifests/monitoring/target.pp

@@ -6,12 +6,12 @@
 class confdroid_ssh::monitoring::target (
 ) inherits confdroid_ssh::params {
   if $ssh_manage_nagios == true {
-    @@nagios_service { "check_ssh_${fqdn}":
-      check_command       => "check_nrpe!check_ssh!${ssh_procs_allowed}!sshd",
+    @@nagios_service { "check_sshd_${fqdn}":
+      check_command       => "check_nrpe!check_sshd!${ssh_procs_allowed}!sshd",
       use                 => 'generic-service',
       host_name           => $fqdn,
       notification_period => '24x7',
-      service_description => "${fqdn}_check_ssh",
+      service_description => "${fqdn}_check_sshd",
       target              => $ssh_target_service,
       owner               => 'nagios',
       group               => 'nagios',