Recommit for updates in build 69

doc/file.README.html

@@ -110,9 +110,11 @@
 </li><li>
 <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><li>
+<p>configures the main nagios configuration file and sets values as (pre)configured per values in params, which can be overwritten.</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></ul>
 
 <h3 id="label-configuring+user+access">configuring user access</h3>

doc/index.html

@@ -110,9 +110,11 @@
 </li><li>
 <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><li>
+<p>configures the main nagios configuration file and sets values as (pre)configured per values in params, which can be overwritten.</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></ul>
 
 <h3 id="label-configuring+user+access">configuring user access</h3>

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html

@@ -476,7 +476,7 @@ class confdroid_nagios::main::dirs (
       path     => $ng_run_dir,
       owner    => 'nagios',
       group    => 'nagios',
-      mode     => '0750',
+      mode     => '0755',
       selrange => s0,
       selrole  => object_r,
       seltype  => nagios_var_run_t,
@@ -489,7 +489,7 @@ class confdroid_nagios::main::dirs (
       path     => $ng_cmd_dir,
       owner    => 'nagios',
       group    => 'nagios',
-      mode     => '0775',
+      mode     => '2775',
       selrange => s0,
       selrole  => object_r,
       seltype  => nagios_spool_t,
@@ -502,7 +502,7 @@ class confdroid_nagios::main::dirs (
       path     => $ng_checkresults_dir,
       owner    => 'nagios',
       group    => 'nagios',
-      mode     => '0770',
+      mode     => '0750',
       selrange => s0,
       selrole  => object_r,
       seltype  => nagios_spool_t,

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -271,6 +271,24 @@ inherited by all classes except defines.
         —
         <div class='inline'>
 <p>Whether to enable the context help in the Nagios web interface. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_file</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;/var/log/nagios/nagios.log&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The path to the Nagios log file. Default is ‘/var/log/nagios/nagios.log’.</p>
 </div>
       
     </li>
@@ -286,8 +304,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-29
-30
 31
 32
 33
@@ -396,10 +412,15 @@ inherited by all classes except defines.
 136
 137
 138
-139</pre>
+139
+140
+141
+142
+143
+144</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 29</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
 
 class confdroid_nagios::params (
 
@@ -412,7 +433,10 @@ class confdroid_nagios::params (
   String $ng_main_user              = &#39;nagios&#39;,
   String $ng_main_password          = &#39;nagios&#39;,
 
-# cgi
+# nagios.cfg
+  String $ng_log_file              = &#39;/var/log/nagios/nagios.log&#39;,
+
+# cgi.cfg
   String $ng_context_help           = &#39;1&#39;,
 
 # httpd