Recommit for updates in build 57

doc/file.README.html

@@ -69,6 +69,9 @@
 <p><a href="#warning">WARNING</a></p>
 </li><li>
 <p><a href="#features">Features</a></p>
+<ul><li>
+<p><a href="#configuring-user-access">configuring user access</a></p>
+</li></ul>
 </li><li>
 <p><a href="#repo-documentation">Repo Documentation</a></p>
 </li><li>
@@ -106,6 +109,10 @@
 <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>
+
+<p>ToDo</p>
+
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 
 <p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>

doc/index.html

@@ -69,6 +69,9 @@
 <p><a href="#warning">WARNING</a></p>
 </li><li>
 <p><a href="#features">Features</a></p>
+<ul><li>
+<p><a href="#configuring-user-access">configuring user access</a></p>
+</li></ul>
 </li><li>
 <p><a href="#repo-documentation">Repo Documentation</a></p>
 </li><li>
@@ -106,6 +109,10 @@
 <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>
+
+<p>ToDo</p>
+
 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
 
 <p>See the full Puppet documentation including parameters in <code>docs/index.html</code></p>

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -297,6 +297,42 @@ inherited by all classes except defines.
         —
         <div class='inline'>
 <p>Whether to configure the Nagios web interface to use HTTPS. Default is false. We recommend using a reverse proxy with SSL termination in front of the Nagios web interface, so this is disabled by default.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_main_user</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;nagios&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The username for the Nagios web interface. Default is ‘nagios’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_main_password</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;nagios&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The encrypted password for the Nagios web interface. Default is ‘nagios’.</p>
 </div>
       
     </li>
@@ -312,10 +348,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-32
-33
-34
-35
 36
 37
 38
@@ -418,10 +450,16 @@ inherited by all classes except defines.
 135
 136
 137
-138</pre>
+138
+139
+140
+141
+142
+143
+144</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 32</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 36</span>
 
 class confdroid_nagios::params (
 
@@ -431,6 +469,8 @@ class confdroid_nagios::params (
   Array $ng_reqpackages_client      = [&#39;net-snmp-utils&#39;,&#39;nagios-plugins&#39;,&#39;nagios-plugins-all&#39;,&#39;nagios-plugins-nrpe&#39;,&#39;nagios-common&#39;],
   String $ng_pkg_ensure             = &#39;present&#39;,
   Boolean $ng_include_nrpe          = true,
+  String $ng_main_user              = &#39;nagios&#39;,
+  String $ng_main_password          = &#39;nagios&#39;,
 
 # httpd
   Boolean $ng_use_https       = false,

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aaccess_rules.html

@@ -120,7 +120,14 @@
 22
 23
 24
-25</pre>
+25
+26
+27
+28
+29
+30
+31
+32</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/access_rules.pp', line 6</span>
@@ -143,6 +150,13 @@ class confdroid_nagios::server::access_rules (
       seluser  =&gt; system_u,
       notify   =&gt; Service[$ng_nagios_service],
     }
+
+    # manage file header
+    concat::fragment { &#39;fle_header&#39;:
+      target  =&gt; $ng_htpasswd_file,
+      content =&gt; template($ng_htpasswd_head),
+      order   =&gt; &#39;000&#39;,
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html

@@ -76,10 +76,15 @@
   </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>
 
@@ -96,10 +101,6 @@
         <pre class="lines">
 
 
-2
-3
-4
-5
 6
 7
 8
@@ -110,10 +111,14 @@
 13
 14
 15
-16</pre>
+16
+17
+18
+19
+20</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 2</span>
+        <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span>
 
 class confdroid_nagios::server::files (
 

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html

@@ -121,7 +121,8 @@
 23
 24
 25
-26</pre>
+26
+27</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -131,6 +132,7 @@ class confdroid_nagios::server::service (
 ) inherits confdroid_nagios::params {
   require confdroid_nagios::server::files
   if $ng_nagios_server == $fqdn {
+    require confdroid_nagios::server::access_rules
     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;],