Recommit for updates in build 63

This commit is contained in:
Jenkins Server
2026-02-19 17:02:05 +01:00
parent c6b98b7b4d
commit 6cad7116f9

View File

@@ -302,7 +302,21 @@
204 204
205 205
206 206
207</pre> 207
208
209
210
211
212
213
214
215
216
217
218
219
220
221</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -364,45 +378,32 @@ class confdroid_nagios::main::dirs (
seltype =&gt; nagios_etc_t, seltype =&gt; nagios_etc_t,
seluser =&gt; system_u, seluser =&gt; system_u,
} }
# /usr/lib64/nagios dir required for plugins
# file { $ng_lib_dir:
# ensure =&gt; directory,
# path =&gt; $ng_lib_dir,
# owner =&gt; &#39;root&#39;,
# group =&gt; &#39;root&#39;,
# mode =&gt; &#39;0755&#39;,
# selrange =&gt; s0,
# selrole =&gt; object_r,
# seltype =&gt; lib_t,
# seluser =&gt; system_u,
# }
# /var/spool/nagios # /usr/lib64/nagios dir required for plugins
# file { $ng_spool_dir: file { $ng_lib_dir:
# ensure =&gt; directory, ensure =&gt; directory,
# path =&gt; $ng_spool_dir, path =&gt; $ng_lib_dir,
# owner =&gt; &#39;nagios&#39;, owner =&gt; &#39;root&#39;,
# group =&gt; &#39;nagios&#39;, group =&gt; &#39;root&#39;,
# mode =&gt; &#39;0755&#39;, mode =&gt; &#39;0755&#39;,
# selrange =&gt; s0, selrange =&gt; s0,
# selrole =&gt; object_r, selrole =&gt; object_r,
# seltype =&gt; nagios_spool_t, seltype =&gt; lib_t,
# seluser =&gt; system_u, seluser =&gt; system_u,
# } }
# /var/spool/nagios
# /etc/nagios/conf.d file { $ng_spool_dir:
# file { $ng_conf_d_dir: ensure =&gt; directory,
# ensure =&gt; directory, path =&gt; $ng_spool_dir,
# path =&gt; $ng_conf_d_dir, owner =&gt; &#39;nagios&#39;,
# owner =&gt; &#39;root&#39;, group =&gt; &#39;nagios&#39;,
# group =&gt; &#39;nagios&#39;, mode =&gt; &#39;0755&#39;,
# mode =&gt; &#39;0750&#39;, selrange =&gt; s0,
# selrange =&gt; s0, selrole =&gt; object_r,
# selrole =&gt; object_r, seltype =&gt; nagios_spool_t,
# seltype =&gt; nagios_etc_t, seluser =&gt; system_u,
# seluser =&gt; system_u, }
# }
# include dir # include dir
# file { $ng_usr_incl: # file { $ng_usr_incl:
@@ -508,6 +509,33 @@ class confdroid_nagios::main::dirs (
# seluser =&gt; system_u, # seluser =&gt; system_u,
# } # }
} }
if $ng_nagios_server != $fqdn {
# ensure client directories exist on server for potential future use
file { $ng_lib_dir:
ensure =&gt; directory,
path =&gt; $ng_lib_dir,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; usr_t,
seluser =&gt; system_u,
}
file { $ng_spool_dir:
ensure =&gt; directory,
path =&gt; $ng_spool_dir,
owner =&gt; &#39;nagios&#39;,
group =&gt; &#39;nagios&#39;,
mode =&gt; &#39;0755&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; nagios_spool_t,
seluser =&gt; system_u,
}
}
}</pre> }</pre>
</td> </td>
</tr> </tr>