recommit for updates in build 15

CHANGELOG.md

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/05036af24182601">05036af24182601</a> Jenkins Server <i>2017-07-20 16:26:40</i>
+<p>
+<h3>recommit for updates in build 12</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/6e251a61a25bb1d">6e251a61a25bb1d</a> Arne Teuke <i>2017-07-20 16:26:21</i>
+<p>
+<h3>changed wrong refresh</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2d7dc8a5c57ed98">2d7dc8a5c57ed98</a> Jenkins Server <i>2017-07-20 16:21:27</i>
 <p>
 <h3>recommit for updates in build 11</h3>

REPOSTRUCTURE.md

@@ -49,6 +49,8 @@
 |   |-- init.pp
 |   `-- params.pp
 |-- templates
+|   |-- httpd
+|   |   `-- nagios_conf.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
 |   |   `-- htpasswd_rule.erb
@@ -65,4 +67,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-15 directories, 50 files
+16 directories, 51 files

doc/_index.html

@@ -176,7 +176,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:35 2017 by
+  Generated on Fri Jul 21 13:06:54 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/file.README.html

@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_nagios</code>| 0.0.0.6 | <a
+|<code>cd_nagios</code>| 0.0.0.7 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
 Status</a>/]|</p>
 
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:36 2017 by
+  Generated on Fri Jul 21 13:06:55 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/index.html

@@ -61,7 +61,7 @@
 <p>|Repo Name| version | Build
 Status|
 |---|---|---|---|
-|<code>cd_nagios</code>| 0.0.0.6 | <a
+|<code>cd_nagios</code>| 0.0.0.7 | <a
 href="https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
 Status</a>/]|</p>
 
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:35 2017 by
+  Generated on Fri Jul 21 13:06:54 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios.html

@@ -139,7 +139,7 @@ class cd_nagios {
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:36 2017 by
+  Generated on Fri Jul 21 13:06:55 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:38 2017 by
+  Generated on Fri Jul 21 13:06:57 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html

@@ -187,7 +187,7 @@ class cd_nagios::main::config (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:37 2017 by
+  Generated on Fri Jul 21 13:06:56 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:37 2017 by
+  Generated on Fri Jul 21 13:06:56 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html

@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:38 2017 by
+  Generated on Fri Jul 21 13:06:56 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:37 2017 by
+  Generated on Fri Jul 21 13:06:56 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aparams.html

@@ -1803,6 +1803,27 @@ unchecked.</p>
 <p>Whether to enable selinux tools and
 policies. only effective if selinux is
 enabled.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_required_hosts</span>
+      
+      
+        <span class='type'>(<tt>array</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>[&#39;&#39;]</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Array of FQDNs for hosts which should be
+allowed/required. every entry in
+the array creates a new line in the
+configuration file.</p>
 </div>
       
     </li>
@@ -1824,9 +1845,6 @@ enabled.</p>
         <pre class="lines">
 
 
-198
-199
-200
 201
 202
 203
@@ -1974,10 +1992,19 @@ enabled.</p>
 345
 346
 347
-348</pre>
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 198</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 201</span>
 
 class cd_nagios::params (
 
@@ -2085,6 +2112,9 @@ $ng_ack_no_send       = &#39;0&#39;,
 # selinux
 $ng_use_selinux_tools = true,
 
+# httpd
+$ng_required_hosts    = [&#39;&#39;],
+
 ) {
 
 # installation section
@@ -2100,30 +2130,33 @@ $ng_use_selinux_tools = true,
   }
 
 # service
-$ng_service       = &#39;nagios&#39;
+$ng_service         = &#39;nagios&#39;
+$ae_service         = &#39;httpd&#39;
 
 # directories
-$ng_main_dir      = &#39;/etc/nagios&#39;
+$ng_main_dir        = &#39;/etc/nagios&#39;
-$ng_conf_d_dir    = &quot;${ng_main_dir}/conf.d&quot;
+$ng_conf_d_dir      = &quot;${ng_main_dir}/conf.d&quot;
-$ng_objects_dir   = &quot;${ng_main_dir}/objects&quot;
+$ng_objects_dir     = &quot;${ng_main_dir}/objects&quot;
-$ng_private_dir   = &quot;${ng_main_dir}/private&quot;
+$ng_private_dir     = &quot;${ng_main_dir}/private&quot;
-$ng_usr_incl      = &#39;/usr/include/nagios&#39;
+$ng_usr_incl        = &#39;/usr/include/nagios&#39;
-$ng_lib_dir       = &#39;/usr/lib64/nagios&#39;
+$ng_lib_dir         = &#39;/usr/lib64/nagios&#39;
-$ng_log_dir       = &#39;/var/log/nagios&#39;
+$ng_log_dir         = &#39;/var/log/nagios&#39;
-$ng_log_archives  = &quot;${ng_log_dir}/archives&quot;
+$ng_log_archives    = &quot;${ng_log_dir}/archives&quot;
-$ng_spool_dir     = &#39;/var/spool/nagios&#39;
+$ng_spool_dir       = &#39;/var/spool/nagios&#39;
-$ng_usr_share     = &#39;/usr/share/nagios&#39;
+$ng_usr_share       = &#39;/usr/share/nagios&#39;
-$ng_share_html    = &quot;${ng_usr_share}/html&quot;
+$ng_share_html      = &quot;${ng_usr_share}/html&quot;
 
 # files
-$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;cd_nagios/nagios/cgi_cfg.erb&#39;
+$ng_cgi_cfg_erb     = &#39;cd_nagios/nagios/cgi_cfg.erb&#39;
-$ng_htpasswd_file = &quot;${ng_main_dir}/passwd&quot;
+$ng_htpasswd_file   = &quot;${ng_main_dir}/passwd&quot;
-$ng_htpasswd_head = &#39;cd_nagios/nagios/htpasswd_head.erb&#39;
+$ng_htpasswd_head   = &#39;cd_nagios/nagios/htpasswd_head.erb&#39;
-$ng_htpasswd_rule = &#39;cd_nagios/nagios/htpasswd_rule.erb&#39;
+$ng_htpasswd_rule   = &#39;cd_nagios/nagios/htpasswd_rule.erb&#39;
-$ng_taccgi_erb    = &#39;cd_nagios/selinux/taccgi.erb&#39;
+$ng_taccgi_erb      = &#39;cd_nagios/selinux/taccgi.erb&#39;
-$ng_statcgi_erb   = &#39;cd_nagios/selinux/statuscgi.erb&#39;
+$ng_statcgi_erb     = &#39;cd_nagios/selinux/statuscgi.erb&#39;
+$ng_nagios_conf     = &#39;/etc/httpd/conf.d/nagios.conf&#39;
+$ng_nagios_conf_erb = &#39;cd_nagios/httpd/nagios_conf.erb&#39;
 
 # includes must be last
 
@@ -2137,7 +2170,7 @@ $ng_statcgi_erb   = &#39;cd_nagios/selinux/statuscgi.erb&#39;
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:37 2017 by
+  Generated on Fri Jul 21 13:06:56 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html

@@ -182,7 +182,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 73
 74
 75
-76</pre>
+76
+77</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/selinux/config.pp', line 24</span>
@@ -218,7 +219,7 @@ class cd_nagios::selinux::config (
       path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
       cwd         =&gt;  $ng_user_home,
       require     =&gt;  Exec[&#39;create_policy_taccgi&#39;],
-      refreshonly =&gt; true,
+      refreshonly =&gt;  true,
     }
 
     # sealert status.cgi
@@ -236,7 +237,8 @@ class cd_nagios::selinux::config (
       path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
       cwd         =&gt;  $ng_user_home,
       require     =&gt;  Exec[&#39;create_policy_statuscgi&#39;],
-      refreshonly =&gt; true,
+      refreshonly =&gt;  true,
+      notify      =&gt;  Service[$ng_service],
     }
   }
 }</pre>
@@ -247,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:38 2017 by
+  Generated on Fri Jul 21 13:06:57 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:38 2017 by
+  Generated on Fri Jul 21 13:06:57 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html

@@ -156,7 +156,23 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 47
 48
 49
-50</pre>
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 23</span>
@@ -187,6 +203,22 @@ class cd_nagios::server::files (
       content   =&gt;  template($ng_cgi_cfg_erb),
       notify    =&gt;  Service[$ng_service],
     }
+
+    # manage nagios.conf for httpd
+
+    file { $ng_nagios_conf:
+      ensure    =&gt;  file,
+      path      =&gt;  $ng_nagios_conf,
+      owner     =&gt;  &#39;root&#39;,
+      group     =&gt;  &#39;root&#39;,
+      mode      =&gt;  &#39;0644&#39;,
+      selrange  =&gt;  s0,
+      selrole   =&gt;  object_r,
+      seltype   =&gt;  httpd_config_t,
+      seluser   =&gt;  system_u,
+      content   =&gt;  template($ng_nagios_conf_erb),
+      notify    =&gt;  Service[$ae_service],
+    }
   }
 }</pre>
       </td>
@@ -196,7 +228,7 @@ class cd_nagios::server::files (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:38 2017 by
+  Generated on Fri Jul 21 13:06:56 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html

@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:38 2017 by
+  Generated on Fri Jul 21 13:06:57 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html

@@ -209,7 +209,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:38 2017 by
+  Generated on Fri Jul 21 13:06:57 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Jul 20 18:26:36 2017 by
+  Generated on Fri Jul 21 13:06:55 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.0.0).
 </div>