Recommit for updates in build 15

README.md

@@ -47,6 +47,7 @@ CONFIGURATION
   - ACL options
 - adds haproxy logs to rsyslog for remote logging where used
 - manage fail2ban integration (optional, requires `confdroid_fail2ban` module)
+- manage nagios integration (optional, requires `confdroid-nagios` module)
 
 SERVICE
 

doc/file.README.html

@@ -131,6 +131,8 @@
 <p>adds haproxy logs to rsyslog for remote logging where used</p>
 </li><li>
 <p>manage fail2ban integration (optional, requires <code>confdroid_fail2ban</code> module)</p>
+</li><li>
+<p>manage nagios integration (optional, requires <code>confdroid-nagios</code> module)</p>
 </li></ul>
 
 <p>SERVICE</p>

doc/index.html

@@ -131,6 +131,8 @@
 <p>adds haproxy logs to rsyslog for remote logging where used</p>
 </li><li>
 <p>manage fail2ban integration (optional, requires <code>confdroid_fail2ban</code> module)</p>
+</li><li>
+<p>manage nagios integration (optional, requires <code>confdroid-nagios</code> module)</p>
 </li></ul>
 
 <p>SERVICE</p>

doc/puppet_classes/confdroid_haproxy_3A_3Aparams.html

@@ -947,7 +947,7 @@
         <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>&#39;1:1&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;1:&#39;</tt>)</em>
       
       
     </li>
@@ -1128,7 +1128,7 @@ class confdroid_haproxy::params (
   Boolean $hy_manage_nagios           = false,
   String $hy_target_service           = &#39;/etc/nagios/conf.d/haproxy_service.cfg&#39;,
   Array $hy_target_contacts           = [&#39;nagiosadmin&#39;],
-  String $hy_procs_allowed            = &#39;1:1&#39;
+  String $hy_procs_allowed            = &#39;1:&#39;
 
 ) {
   $fqdn                               = $facts[&#39;networking&#39;][&#39;fqdn&#39;]

manifests/params.pp

@@ -122,7 +122,7 @@ class confdroid_haproxy::params (
   Boolean $hy_manage_nagios           = false,
   String $hy_target_service           = '/etc/nagios/conf.d/haproxy_service.cfg',
   Array $hy_target_contacts           = ['nagiosadmin'],
-  String $hy_procs_allowed            = '1:1'
+  String $hy_procs_allowed            = '1:'
 
 ) {
   $fqdn                               = $facts['networking']['fqdn']