Recommit for updates in build 36

doc/puppet_classes/confdroid_apache_3A_3Amonitoring_3A_3Atarget.html

@@ -137,7 +137,7 @@ class confdroid_apache::monitoring::target (
       owner               => 'nagios',
       group               => 'nagios',
       mode                => '0640',
-      contacts            => 'ops',
+      contacts            => $ae_target_contacts,
     }
   }
 }</pre>

doc/puppet_classes/confdroid_apache_3A_3Aparams.html

@@ -385,6 +385,24 @@ inherited by all classes except defines.
       
     </li>
   
+    <li>
+      
+        <span class='name'>ae_target_contacts</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;nagiosadmin&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>which contacts to notify for nagios alerts</p>
+</div>
+      
+    </li>
+  
     <li>
       
         <span class='name'>ae_manage_fw</span>
@@ -432,7 +450,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-46
 47
 48
 49
@@ -494,16 +511,18 @@ inherited by all classes except defines.
 105
 106
 107
-108</pre>
+108
+109
+110</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 46</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 47</span>
 
 class confdroid_apache::params (
 
 # installation
-  String $pkg_ensure         = &#39;present&#39;,
-  Array $reqpackages        = [&#39;httpd&#39;,&#39;mod_ssl&#39;],
+  String $pkg_ensure          = &#39;present&#39;,
+  Array $reqpackages          = [&#39;httpd&#39;,&#39;mod_ssl&#39;],
 
 # configuration files
   Boolean $ae_manage_cfg      = false,
@@ -512,13 +531,14 @@ class confdroid_apache::params (
 
 # nagios
   Boolean $ae_incl_target     = false,
-  String $ae_target_service  = &#39;/etc/nagios/conf.d/httpd_service.cfg&#39;,
+  String $ae_target_service   = &#39;/etc/nagios/conf.d/httpd_service.cfg&#39;,
+  String $ae_target_contacts  = &#39;nagiosadmin&#39;,
 
 # firewall
   Boolean $ae_manage_fw       = true,
-  String $ae_order_no        = &#39;50&#39;,
-  String $ae_http_port       = &#39;80&#39;,
-  String $ae_https_port      = &#39;443&#39;,
+  String $ae_order_no         = &#39;50&#39;,
+  String $ae_http_port        = &#39;80&#39;,
+  String $ae_https_port       = &#39;443&#39;,
 
 ) {
 # facts