Recommit for updates in build 145

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -1198,7 +1198,8 @@ inherited by all classes except defines.
 280
 281
 282
-283</pre>
+283
+284</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 109</span>
@@ -1353,6 +1354,7 @@ class confdroid_nagios::params (
   $ng_precached_obj_file      = &quot;${ng_spool_dir}/objects.precache&quot;
   $ng_status_file             = &quot;${ng_spool_dir}/status.dat&quot;
   $ng_command_file            = &quot;${ng_cmd_dir}/nagios.cmd&quot;
+  $ng_lock_file               = &quot;${ng_run_dir}/nagios.pid&quot;
 
 ## old
   $ng_taccgi_erb              = &#39;confdroid_nagios/selinux/taccgi.erb&#39;

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html

@@ -115,7 +115,35 @@
 17
 18
 19
-20</pre>
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span>
@@ -126,12 +154,40 @@ class confdroid_nagios::server::files (
   require confdroid_nagios::main::dirs
   if $ng_nagios_server == $fqdn {
     file { $ng_nagios_cfg_file:
-      ensure  =&gt; file,
+      ensure   =&gt; file,
-      owner   =&gt; &#39;nagios&#39;,
+      owner    =&gt; &#39;nagios&#39;,
-      group   =&gt; &#39;nagios&#39;,
+      group    =&gt; &#39;nagios&#39;,
-      mode    =&gt; &#39;0644&#39;,
+      mode     =&gt; &#39;0644&#39;,
-      content =&gt; template($ng_nagios_cfg_erb),
+      selrange =&gt; s0,
-      notify  =&gt; Service[$ng_service],
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_etc_t,
+      seluser  =&gt; system_u,
+      content  =&gt; template($ng_nagios_cfg_erb),
+      notify   =&gt; Service[$ng_service],
+    }
+
+    file { $ng_nagios_cgi_cfg_file:
+      ensure   =&gt; file,
+      owner    =&gt; &#39;nagios&#39;,
+      group    =&gt; &#39;nagios&#39;,
+      mode     =&gt; &#39;0644&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_etc_t,
+      seluser  =&gt; system_u,
+      content  =&gt; template($ng_nagios_cgi_cfg_erb),
+      notify   =&gt; Service[$ng_service],
+    }
+
+    file { $ng_lock_file:
+      ensure   =&gt; file,
+      owner    =&gt; &#39;nagios&#39;,
+      group    =&gt; &#39;nagios&#39;,
+      mode     =&gt; &#39;0644&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_var_run_t,
+      seluser  =&gt; system_u,
     }
   }
 }</pre>