Recommit for updates in build 135

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html

@@ -327,8 +327,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'notify-host-by-email',
       command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -337,8 +337,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'notify-service-by-email',
       command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -347,8 +347,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check-host-alive',
       command_line => '$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -357,8 +357,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_disk',
       command_line => '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -367,8 +367,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_load',
       command_line => '$USER1$/check_load -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -377,8 +377,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_procs',
       command_line => '$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -387,8 +387,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_users',
       command_line => '$USER1$/check_users -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -397,8 +397,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_local_swap',
       command_line => '$USER1$/check_swap -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -407,8 +407,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_ftp',
       command_line => '$USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -417,8 +417,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_snmp',
       command_line => '$USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -427,8 +427,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_http',
       command_line => '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -437,8 +437,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_ssh',
       command_line => '$USER1$/check_ssh $ARG1$ $HOSTADDRESS$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -447,8 +447,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_ping',
       command_line => '$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -457,8 +457,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_tcp',
       command_line => '$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -467,8 +467,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_udp',
       command_line => '$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -477,8 +477,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_nrpe',
       command_line => '$USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$  -a $ARG2$ $ARG3$ $ARG4$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -487,8 +487,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_nagios',
       command_line => '$USER1$/check_nagios -F $ARG1$ -e $ARG2$ -C $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -497,8 +497,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'check_bandwidth',
       command_line => '$USER1$/check_bandwidth.sh -t 30 -H $HOSTADDRESS$ linux  $ARG1$  $ARG2$ $ARG3$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -507,8 +507,8 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'process-service-perfdata-file',
       command_line => '/bin/mv /var/log/pnp4nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
@@ -517,18 +517,18 @@ class confdroid_nagios::nagios::objects::commands (
       ensure       => present,
       command_name => 'process-host-perfdata-file',
       command_line => '/bin/mv /var/log/pnp4nagios/host-perfdata /var/spool/pnp4nagios/host-perfdata.$TIMET$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }
 
-    @@nagios_command {  'check_ntp_time':
+    @@nagios_command { 'check_ntp_time':
       ensure       => present,
       command_name => 'check_ntp_time',
       command_line => '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$',
-      owner        => 'nagios',
-      group        => 'nagios',
+      owner        => $ng_user,
+      group        => $ng_user,
       mode         => '0640',
       target       => $ng_target_command,
     }

doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html

@@ -97,12 +97,9 @@ concat.
     <p class="tag_title">Examples:</p>
     
       
-        <p class="example_title"><div class='inline'>
-<p>confdroid_nagios::nagios::objects::templates { ‘generic contact’:</p>
-</div></p>
-      
-      <pre class="example code"><code>ng_template_object      =&gt; &#39;contact&#39;,
-ng_template_object_name =&gt; &#39;generic-contact&#39;,
+      <pre class="example code"><code>confdroid_nagios::nagios::objects::templates { &#39;generic contact&#39;:
+  ng_template_object      =&gt; &#39;contact&#39;,
+  ng_template_object_name =&gt; &#39;generic-contact&#39;,
 }</code></pre>
     
   </div>
@@ -116,7 +113,6 @@ ng_template_object_name =&gt; &#39;generic-contact&#39;,
         <pre class="lines">
 
 
-11
 12
 13
 14
@@ -187,10 +183,11 @@ ng_template_object_name =&gt; &#39;generic-contact&#39;,
 79
 80
 81
-82</pre>
+82
+83</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 11</span>
+        <pre class="code"><span class="info file"># File 'manifests/nagios/objects/template_rules.pp', line 12</span>
 
 class confdroid_nagios::nagios::objects::template_rules (
 

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -1334,7 +1334,7 @@ class confdroid_nagios::params (
   $ng_tgt_svcgrp_head_erb     = 'confdroid_nagios/nagios/svcgroups_cfg_head.erb'
   $ng_tgt_svcgrp_rule_erb     = 'confdroid_nagios/nagios/svcgroups_cfg_rule.erb'
   $ng_target_base_contact     = "${ng_conf_d_dir}/nagios_contact_base.cfg"
-  $ng_target_add_contact      = "${ng_conf_d_dir}/nagios_contact_add.cfg"
+  $ng_target_add_contact      = "${ng_conf_d_dir}/nagios_contact.cfg"
   $ng_contacts_head_erb       = 'confdroid_nagios/nagios/contacts_cfg_head.erb'
   $ng_contacts_rule_erb       = 'confdroid_nagios/nagios/contacts_cfg_rule.erb'
   $ng_tgt_contactgroup_base   = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"