Recommit for updates in build 54

This commit is contained in:
Jenkins Server
2026-02-14 21:06:16 +01:00
parent 2959e38b8c
commit 7704eea506
8 changed files with 471 additions and 18 deletions

View File

@@ -98,6 +98,11 @@
</li>
<li>
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::confdroid_nagios::server::access_rules (puppet_class)">confdroid_nagios::server::access_rules</a></span>
</li>
<li>
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::confdroid_nagios::server::files (puppet_class)">confdroid_nagios::server::files</a></span>
@@ -122,6 +127,30 @@
<h2>Defined Type Listing A-Z</h2>
<table>
<tr>
<td valign='top' width="33%">
<ul id="alpha_C" class="alpha">
<li class="letter">C</li>
<ul>
<li>
<span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html" title="puppet_defined_types::confdroid_nagios::server::access (puppet_defined_type)">confdroid_nagios::server::access</a></span>
</li>
</ul>
</ul>
</td>
</tr>
</table>

View File

@@ -28,6 +28,10 @@
Puppet Classes
</a></span>
<span><a target="_self" href="puppet_defined_type_list.html">
Defined Types
</a></span>
</div>
<div id="search">Search: <input type="text" /></div>
@@ -78,21 +82,28 @@
</li>
<li id="object_puppet_classes::confdroid_nagios::server::files" class="odd">
<li id="object_puppet_classes::confdroid_nagios::server::access_rules" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::confdroid_nagios::server::access_rules (puppet_class)">confdroid_nagios::server::access_rules</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::server::files" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html" title="puppet_classes::confdroid_nagios::server::files (puppet_class)">confdroid_nagios::server::files</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::server::nagios" class="even">
<li id="object_puppet_classes::confdroid_nagios::server::nagios" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span>
</div>
</li>
<li id="object_puppet_classes::confdroid_nagios::server::service" class="odd">
<li id="object_puppet_classes::confdroid_nagios::server::service" class="even">
<div class="item">
<span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span>
</div>

View File

@@ -81,6 +81,8 @@
<span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span><br/>
<span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html" title="puppet_classes::confdroid_nagios::server::access_rules (puppet_class)">confdroid_nagios::server::access_rules</a></span><br/>
</dd>
</dl>
@@ -415,7 +417,8 @@ inherited by all classes except defines.
134
135
136
137</pre>
137
138</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 32</span>
@@ -432,6 +435,7 @@ class confdroid_nagios::params (
# httpd
Boolean $ng_use_https = false,
) {
# Default facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]

View File

@@ -0,0 +1,160 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Puppet Class: confdroid_nagios::server::access_rules
&mdash; Documentation by YARD 0.9.36
</title>
<link rel="stylesheet" href="../css/style.css" type="text/css" />
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_classes::confdroid_nagios::server::access_rules";
relpath = '../';
</script>
<script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
</head>
<body>
<div class="nav_wrap">
<iframe id="nav" src="../puppet_class_list.html?1"></iframe>
<div id="resizer"></div>
</div>
<div id="main" tabindex="-1">
<div id="header">
<div id="menu">
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Puppet Classes</span></span>
&raquo;
<span class="title">confdroid_nagios::server::access_rules</span>
</div>
<div id="search">
<a class="full_list_link" id="puppet_class_list_link"
href="../puppet_class_list.html">
<svg width="24" height="24">
<rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
</svg>
</a>
</div>
<div class="clear"></div>
</div>
<div id="content"><h1>Puppet Class: confdroid_nagios::server::access_rules</h1>
<div class="box_info">
<dl>
<dt>Inherits:</dt>
<dd><span class='object_link'><a href="confdroid_nagios_3A_3Aparams.html" title="puppet_classes::confdroid_nagios::params (puppet_class)">confdroid_nagios::params</a></span></dd>
</dl>
<dl>
<dt>Defined in:</dt>
<dd>
manifests/server/access_rules.pp
</dd>
</dl>
</div>
<h2>Summary</h2>
Class manages presence of /etc/nagios/passwd file.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>confdroid_nagios::server::access_rules.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
<div class="tags">
</div><div class="method_details_list">
<table class="source_code">
<tr>
<td>
<pre class="lines">
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/access_rules.pp', line 6</span>
class confdroid_nagios::server::access_rules (
) inherits confdroid_nagios::params {
if $fqdn == $ng_nagios_server {
# manage /etc/nagios/passwd file
concat { $ng_htpasswd_file:
ensure =&gt; present,
path =&gt; $ng_htpasswd_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;apache&#39;,
mode =&gt; &#39;0640&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; nagios_etc_t,
seluser =&gt; system_u,
notify =&gt; Service[$ng_nagios_service],
}
}
}</pre>
</td>
</tr>
</table>
</div>
</div>
<div id="footer">
Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
</div>
</div>
</body>
</html>

View File

@@ -76,15 +76,10 @@
</dl>
</div>
<h2>Summary</h2>
Class manages configuration files for the confdroid_nagios module.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>confdroid_nagios::server::files.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
@@ -101,6 +96,10 @@
<pre class="lines">
2
3
4
5
6
7
8
@@ -111,14 +110,10 @@
13
14
15
16
17
18
19
20</pre>
16</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span>
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 2</span>
class confdroid_nagios::server::files (

View File

@@ -131,8 +131,8 @@ class confdroid_nagios::server::service (
) inherits confdroid_nagios::params {
require confdroid_nagios::server::files
if $ng_nagios_server == $fqdn {
exec { &#39;restart_httpd&#39;:
command =&gt; &#39;systemctl restart httpd&#39;,
exec { &#39;reload_httpd&#39;:
command =&gt; &#39;systemctl reload httpd&#39;,
path =&gt; [&#39;/bin&#39;, &#39;/usr/bin&#39;, &#39;/sbin&#39;, &#39;/usr/sbin&#39;],
refreshonly =&gt; true,
}
@@ -143,7 +143,7 @@ class confdroid_nagios::server::service (
enable =&gt; true,
hasrestart =&gt; true,
hasstatus =&gt; true,
require =&gt; Exec[&#39;restart_httpd&#39;],
require =&gt; Exec[&#39;reload_httpd&#39;],
}
}
}</pre>

View File

@@ -0,0 +1,54 @@
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8" />
<link rel="stylesheet" href="css/full_list.css" type="text/css" media="screen" />
<link rel="stylesheet" href="css/common.css" type="text/css" media="screen" />
<script type="text/javascript" charset="utf-8" src="js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="js/full_list.js"></script>
<title>Defined Type List</title>
<base id="base_target" target="_parent" />
</head>
<body>
<div id="content">
<div class="fixed_header">
<h1 id="full_list_header">Defined Type List</h1>
<div id="full_list_nav">
<span><a target="_self" href="puppet_class_list.html">
Puppet Classes
</a></span>
<span><a target="_self" href="puppet_defined_type_list.html">
Defined Types
</a></span>
</div>
<div id="search">Search: <input type="text" /></div>
</div>
<ul id="full_list" class="puppet_defined_type">
<li id="object_puppet_defined_types::confdroid_nagios::server::access" class="odd">
<div class="item">
<span class='object_link'><a href="puppet_defined_types/confdroid_nagios_3A_3Aserver_3A_3Aaccess.html" title="puppet_defined_types::confdroid_nagios::server::access (puppet_defined_type)">confdroid_nagios::server::access</a></span>
</div>
</li>
</ul>
</div>
</body>
</html>

View File

@@ -0,0 +1,200 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
Defined Type: confdroid_nagios::server::access
&mdash; Documentation by YARD 0.9.36
</title>
<link rel="stylesheet" href="../css/style.css" type="text/css" />
<link rel="stylesheet" href="../css/common.css" type="text/css" />
<script type="text/javascript">
pathId = "puppet_defined_types::confdroid_nagios::server::access";
relpath = '../';
</script>
<script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
<script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
</head>
<body>
<div class="nav_wrap">
<iframe id="nav" src="../puppet_defined_type_list.html?1"></iframe>
<div id="resizer"></div>
</div>
<div id="main" tabindex="-1">
<div id="header">
<div id="menu">
<a href="../_index.html">Index (c)</a> &raquo;
<span class='title'><span class='object_link'>Defined Types</span></span>
&raquo;
<span class="title">confdroid_nagios::server::access</span>
</div>
<div id="search">
<a class="full_list_link" id="puppet_class_list_link"
href="../puppet_class_list.html">
<svg width="24" height="24">
<rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
<rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
</svg>
</a>
</div>
<div class="clear"></div>
</div>
<div id="content"><h1>Defined Type: confdroid_nagios::server::access</h1>
<div class="box_info">
<dl>
<dt>Defined in:</dt>
<dd>
manifests/server/access.pp
</dd>
</dl>
</div>
<h2>Summary</h2>
Class manages access configuration for the confdroid_nagios module.
<h2>Overview</h2>
<div class="docstring">
<div class="discussion">
<p>confdroid_nagios::server::access.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p>
</div>
</div>
<div class="tags">
<div class="examples">
<p class="tag_title">Examples:</p>
<pre class="example code"><code>confdroid_nagios::server::access { &#39;example&#39;:
ng_htpasswd_user =&gt; &#39;example_user&#39;,
ng_htpasswd_password =&gt; &#39;example_password_encrypted&#39;,
}</code></pre>
</div>
<p class="tag_title">Parameters:</p>
<ul class="param">
<li>
<span class='name'>ng_htpasswd_user</span>
<span class='type'>(<tt>Optional[String]</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>The username for the Nagios web interface.</p>
</div>
</li>
<li>
<span class='name'>ng_htpasswd_password</span>
<span class='type'>(<tt>Optional[String]</tt>)</span>
<em class="default">(defaults to: <tt>undef</tt>)</em>
&mdash;
<div class='inline'>
<p>The encrypted password for the Nagios web interface.</p>
</div>
</li>
</ul>
</div><div class="method_details_list">
<table class="source_code">
<tr>
<td>
<pre class="lines">
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/server/access.pp', line 13</span>
define confdroid_nagios::server::access (
Optional[String] $ng_htpasswd_user = undef,
Optional[String] $ng_htpasswd_password = undef,
) {
$ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
$ng_htpasswd_file = $confdroid_nagios::params::ng_htpasswd_file
$ng_htpasswd_rule = $confdroid_nagios::params::ng_htpasswd_rule
$ng_service = $confdroid_nagios::params::ng_nagios_service
if $fqdn == $ng_nagios_server {
# create password rules
concat::fragment { $name:
target =&gt; $ng_htpasswd_file,
content =&gt; template($ng_htpasswd_rule),
}
}
}</pre>
</td>
</tr>
</table>
</div>
</div>
<div id="footer">
Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
</div>
</div>
</body>
</html>