Recommit for updates in build 68

doc/file.README.html

@@ -111,6 +111,8 @@
 <p>an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates.</p>
 </li><li>
 <p>if <code>ng_include_nrpe</code>is set to <code>true</code>, the confdroid_nrpe module is automatically applied on clients (<a href="https://sourcecode.confdroid.com/confdroid/confdroid_nrpe">confdroid_nrpe</a> must be in the catalogue then)</p>
+</li><li>
+<p>configures all required directories for server and clients and sets proper permissions and selinux contexts</p>
 </li></ul>
 
 <h3 id="label-configuring+user+access">configuring user access</h3>

doc/index.html

@@ -111,6 +111,8 @@
 <p>an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates.</p>
 </li><li>
 <p>if <code>ng_include_nrpe</code>is set to <code>true</code>, the confdroid_nrpe module is automatically applied on clients (<a href="https://sourcecode.confdroid.com/confdroid/confdroid_nrpe">confdroid_nrpe</a> must be in the catalogue then)</p>
+</li><li>
+<p>configures all required directories for server and clients and sets proper permissions and selinux contexts</p>
 </li></ul>
 
 <h3 id="label-configuring+user+access">configuring user access</h3>

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -253,6 +253,24 @@ inherited by all classes except defines.
         —
         <div class='inline'>
 <p>The encrypted password for the Nagios web interface. Default is ‘nagios’. Must be properly encrypted using the htpasswd utility.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_context_help</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to enable the context help in the Nagios web interface. Default is ‘1’.</p>
 </div>
       
     </li>
@@ -268,8 +286,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-27
-28
 29
 30
 31
@@ -375,10 +391,15 @@ inherited by all classes except defines.
 131
 132
 133
-134</pre>
+134
+135
+136
+137
+138
+139</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 27</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 29</span>
 
 class confdroid_nagios::params (
 
@@ -391,6 +412,9 @@ class confdroid_nagios::params (
   String $ng_main_user              = &#39;nagios&#39;,
   String $ng_main_password          = &#39;nagios&#39;,
 
+# cgi
+  String $ng_context_help           = &#39;1&#39;,
+
 # httpd
   Boolean $ng_use_https       = false,
 

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html

@@ -124,16 +124,16 @@ class confdroid_nagios::server::files (
 
 ) inherits confdroid_nagios::params {
   require confdroid_nagios::main::dirs
-#  if $ng_nagios_server == $fqdn {
-#    file { $ng_nagios_cfg_file:
-#      ensure  => file,
-#      owner   => 'nagios',
-#      group   => 'nagios',
-#      mode    => '0644',
-#      content => template($ng_nagios_cfg_erb),
-#      notify  => Service[$ng_nagios_service],
-#    }
-#  }
+  if $ng_nagios_server == $fqdn {
+    file { $ng_nagios_cfg_file:
+      ensure  => file,
+      owner   => 'nagios',
+      group   => 'nagios',
+      mode    => '0644',
+      content => template($ng_nagios_cfg_erb),
+      notify  => Service[$ng_nagios_service],
+    }
+  }
 }</pre>
       </td>
     </tr>