Recommit for updates in build 77

This commit is contained in:
Jenkins Server
2026-02-28 15:54:09 +01:00
parent a94f64033a
commit d1e6332865
3 changed files with 55 additions and 7 deletions

View File

@@ -71,6 +71,8 @@
<p><a href="#features">Features</a></p> <p><a href="#features">Features</a></p>
<ul><li> <ul><li>
<p><a href="#configuring-user-access">configuring user access</a></p> <p><a href="#configuring-user-access">configuring user access</a></p>
</li><li>
<p><a href="#additional-users">Additional users</a></p>
</li></ul> </li></ul>
</li><li> </li><li>
<p><a href="#repo-documentation">Repo Documentation</a></p> <p><a href="#repo-documentation">Repo Documentation</a></p>
@@ -119,7 +121,29 @@
<h3 id="label-configuring+user+access">configuring user access</h3> <h3 id="label-configuring+user+access">configuring user access</h3>
<p>ToDo</p> <p>Main access to the user interface requires defining an administrative user and password via <code>ng_main_user</code> and <code>ng_main_password</code>. The password should be encrypted like this:</p>
<pre class="code ruby"><code class="ruby">htpasswd -B -n testuser
New password:
Re-type new password:
</code></pre>
<p>This results in</p>
<pre class="code ruby"><code class="ruby">testuser: $2y$05$rNy/P22OfYZlpdEPnCAIg.OUizRD34P7pDRwUGiaYjH44PcRuZ2ia
</code></pre>
<p>Use that value to override the default password in ENC or Hiera, if you use it.</p>
<h3 id="label-Additional+users">Additional users</h3>
<p>The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:</p>
<pre class="code ruby"><code class="ruby">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>
<h2 id="label-Repo+Documentation">Repo Documentation</h2> <h2 id="label-Repo+Documentation">Repo Documentation</h2>

View File

@@ -71,6 +71,8 @@
<p><a href="#features">Features</a></p> <p><a href="#features">Features</a></p>
<ul><li> <ul><li>
<p><a href="#configuring-user-access">configuring user access</a></p> <p><a href="#configuring-user-access">configuring user access</a></p>
</li><li>
<p><a href="#additional-users">Additional users</a></p>
</li></ul> </li></ul>
</li><li> </li><li>
<p><a href="#repo-documentation">Repo Documentation</a></p> <p><a href="#repo-documentation">Repo Documentation</a></p>
@@ -119,7 +121,29 @@
<h3 id="label-configuring+user+access">configuring user access</h3> <h3 id="label-configuring+user+access">configuring user access</h3>
<p>ToDo</p> <p>Main access to the user interface requires defining an administrative user and password via <code>ng_main_user</code> and <code>ng_main_password</code>. The password should be encrypted like this:</p>
<pre class="code ruby"><code class="ruby">htpasswd -B -n testuser
New password:
Re-type new password:
</code></pre>
<p>This results in</p>
<pre class="code ruby"><code class="ruby">testuser: $2y$05$rNy/P22OfYZlpdEPnCAIg.OUizRD34P7pDRwUGiaYjH44PcRuZ2ia
</code></pre>
<p>Use that value to override the default password in ENC or Hiera, if you use it.</p>
<h3 id="label-Additional+users">Additional users</h3>
<p>The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:</p>
<pre class="code ruby"><code class="ruby">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>
<h2 id="label-Repo+Documentation">Repo Documentation</h2> <h2 id="label-Repo+Documentation">Repo Documentation</h2>

View File

@@ -504,14 +504,14 @@ class confdroid_nagios::params (
$ng_cntctgrps_rule_erb = &#39;confdroid_nagios/nagios/contactgroups_cfg_rule.erb&#39; $ng_cntctgrps_rule_erb = &#39;confdroid_nagios/nagios/contactgroups_cfg_rule.erb&#39;
$ng_target_command = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot; $ng_target_command = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot;
$ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39; $ng_nagios_service_cmd = &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;
$ng_htpasswd_file = &quot;${ng_main_dir}/passwd&quot;
$ng_htpasswd_head = &#39;confdroid_nagios/nagios/htpasswd_head.erb&#39;
$ng_htpasswd_rule = &#39;confdroid_nagios/nagios/htpasswd_rule.erb&#39;
## old ## old
$ng_main_config = &quot;${ng_main_dir}/nagios.cfg&quot; $ng_main_config = &quot;${ng_main_dir}/nagios.cfg&quot;
$ng_cgi_cfg_file = &quot;${ng_main_dir}/cgi.cfg&quot; $ng_cgi_cfg_file = &quot;${ng_main_dir}/cgi.cfg&quot;
$ng_cgi_cfg_erb = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39; $ng_cgi_cfg_erb = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39;
$ng_htpasswd_file = &quot;${ng_main_dir}/passwd&quot;
$ng_htpasswd_head = &#39;confdroid_nagios/nagios/htpasswd_head.erb&#39;
$ng_htpasswd_rule = &#39;confdroid_nagios/nagios/htpasswd_rule.erb&#39;
$ng_taccgi_erb = &#39;confdroid_nagios/selinux/taccgi.erb&#39; $ng_taccgi_erb = &#39;confdroid_nagios/selinux/taccgi.erb&#39;
$ng_statcgi_erb = &#39;confdroid_nagios/selinux/statuscgi.erb&#39; $ng_statcgi_erb = &#39;confdroid_nagios/selinux/statuscgi.erb&#39;
$ng_statdat_erb = &#39;confdroid_nagios/selinux/statusdat.erb&#39; $ng_statdat_erb = &#39;confdroid_nagios/selinux/statusdat.erb&#39;