Merge branch 'jenkins' into 'master'

Jenkins

See merge request !11

CHANGELOG.md

@@ -8,6 +8,41 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/4ec7633f976a225">4ec7633f976a225</a> Jenkins Server <i>2017-07-21 12:51:33</i>
+<p>
+<h3>recommit for updates in build 24</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5d12bf44374b934">5d12bf44374b934</a> Arne Teuke <i>2017-07-21 12:51:07</i>
+<p>
+<h3>found format options both for hosts and ips</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/442fd08f623728f">442fd08f623728f</a> Arne Teuke <i>2017-07-21 12:44:03</i>
+<p>
+<h3>testing options both for hosts and ips</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b95350b8d8e58b4">b95350b8d8e58b4</a> Arne Teuke <i>2017-07-21 12:41:33</i>
+<p>
+<h3>testing options both for hosts and ips</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a28f890bdde57e2">a28f890bdde57e2</a> Arne Teuke <i>2017-07-21 12:30:09</i>
+<p>
+<h3>testing options both for hosts and ips</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/de3a7fd4fa01415">de3a7fd4fa01415</a> Arne Teuke <i>2017-07-21 12:20:44</i>
+<p>
+<h3>testing options both for hosts and ips</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b37864c7a366aff">b37864c7a366aff</a> Arne Teuke <i>2017-07-21 12:15:47</i>
+<p>
+<h3>testing options both for hosts and ips</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/109eea2716be3ae">109eea2716be3ae</a> Jenkins Server <i>2017-07-21 11:35:04</i>
 <p>
 <h3>recommit for updates in build 18</h3>

REPOSTRUCTURE.md

@@ -51,7 +51,8 @@
 |   `-- params.pp
 |-- templates
 |   |-- httpd
-|   |   `-- nagios_conf.erb
+|   |   |-- nagios_conf.erb
+|   |   `-- welcome_conf.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
 |   |   `-- htpasswd_rule.erb
@@ -68,4 +69,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-16 directories, 52 files
+16 directories, 53 files

doc/_index.html

@@ -181,7 +181,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:27 2017 by
+  Generated on Fri Jul 21 15:06:09 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

@@ -297,7 +297,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:29 2017 by
+  Generated on Fri Jul 21 15:06:10 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

@@ -297,7 +297,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:28 2017 by
+  Generated on Fri Jul 21 15:06:09 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 Fri Jul 21 14:51:29 2017 by
+  Generated on Fri Jul 21 15:06:10 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_3Aclient_3A_3Atarget.html

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:31 2017 by
+  Generated on Fri Jul 21 15:06:12 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 Fri Jul 21 14:51:31 2017 by
+  Generated on Fri Jul 21 15:06:12 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 Fri Jul 21 14:51:30 2017 by
+  Generated on Fri Jul 21 15:06:12 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 Fri Jul 21 14:51:30 2017 by
+  Generated on Fri Jul 21 15:06:11 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 Fri Jul 21 14:51:30 2017 by
+  Generated on Fri Jul 21 15:06:12 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 Fri Jul 21 14:51:30 2017 by
+  Generated on Fri Jul 21 15:06:12 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

@@ -1854,6 +1854,19 @@ Requires format &#39;ipaddress ip address range&#39;</p>
       
     </li>
   
+    <li>
+      
+        <span class='name'>ng_disable_welcome</span>
+      
+      
+        <span class='type'>(<tt>Any</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>true</tt>)</em>
+      
+      
+    </li>
+  
 </ul>
 
 
@@ -2028,7 +2041,9 @@ Requires format &#39;ipaddress ip address range&#39;</p>
 357
 358
 359
-360</pre>
+360
+361
+362</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 203</span>
@@ -2142,7 +2157,7 @@ $ng_use_selinux_tools = true,
 # httpd
 $ng_required_hosts    = &#39;&#39;,
 $ng_required_ips      = &#39;127.0.0.0/8&#39;,
-
+$ng_disable_welcome   = true,
 ) {
 
 # installation section
@@ -2158,33 +2173,35 @@ $ng_required_ips      = &#39;127.0.0.0/8&#39;,
   }
 
 # service
-$ng_service         = &#39;nagios&#39;
+$ng_service           = &#39;nagios&#39;
-$ae_service         = &#39;httpd&#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       = &#39;/etc/httpd/conf.d/nagios.conf&#39;
-$ng_nagios_conf_erb = &#39;cd_nagios/httpd/nagios_conf.erb&#39;
+$ng_nagios_conf_erb   = &#39;cd_nagios/httpd/nagios_conf.erb&#39;
+$ng_welcome_conf      =&#39;/etc/httpd/conf.d/welcome.conf&#39;
+$ng_welcome_conf_erb  = &#39;cd_nagios/httpd/welcome_conf.erb&#39;
 
 # includes must be last
 
@@ -2198,7 +2215,7 @@ $ng_nagios_conf_erb = &#39;cd_nagios/httpd/nagios_conf.erb&#39;
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:30 2017 by
+  Generated on Fri Jul 21 15:06:11 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

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:31 2017 by
+  Generated on Fri Jul 21 15:06:12 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 Fri Jul 21 14:51:31 2017 by
+  Generated on Fri Jul 21 15:06:12 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

@@ -172,7 +172,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 63
 64
 65
-66</pre>
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 23</span>
@@ -219,6 +238,25 @@ class cd_nagios::server::files (
       content   =&gt;  template($ng_nagios_conf_erb),
       notify    =&gt;  Service[$ae_service],
     }
+
+    # manage index.gtml for nagios web server
+
+    if $ng_disable_welcome == true {
+
+      file { $ng_welcome_conf:
+        ensure    =&gt;  file,
+        path      =&gt;  $ng_welcome_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_welcome_conf_erb),
+        notify    =&gt;  Service[$ae_service],
+      }
+    }
   }
 }</pre>
       </td>
@@ -228,7 +266,7 @@ class cd_nagios::server::files (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:31 2017 by
+  Generated on Fri Jul 21 15:06:12 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 Fri Jul 21 14:51:31 2017 by
+  Generated on Fri Jul 21 15:06:12 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

@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 21 14:51:31 2017 by
+  Generated on Fri Jul 21 15:06:12 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 Fri Jul 21 14:51:29 2017 by
+  Generated on Fri Jul 21 15:06:10 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>

manifests/params.pp

@@ -309,7 +309,7 @@ $ng_use_selinux_tools = true,
 # httpd
 $ng_required_hosts    = '',
 $ng_required_ips      = '127.0.0.0/8',
-
+$ng_disable_welcome   = true,
 ) {
 
 # installation section
@@ -325,33 +325,35 @@ $ng_required_ips      = '127.0.0.0/8',
   }
 
 # service
-$ng_service         = 'nagios'
+$ng_service           = 'nagios'
-$ae_service         = 'httpd'
+$ae_service           = 'httpd'
 
 # directories
-$ng_main_dir        = '/etc/nagios'
+$ng_main_dir          = '/etc/nagios'
-$ng_conf_d_dir      = "${ng_main_dir}/conf.d"
+$ng_conf_d_dir        = "${ng_main_dir}/conf.d"
-$ng_objects_dir     = "${ng_main_dir}/objects"
+$ng_objects_dir       = "${ng_main_dir}/objects"
-$ng_private_dir     = "${ng_main_dir}/private"
+$ng_private_dir       = "${ng_main_dir}/private"
-$ng_usr_incl        = '/usr/include/nagios'
+$ng_usr_incl          = '/usr/include/nagios'
-$ng_lib_dir         = '/usr/lib64/nagios'
+$ng_lib_dir           = '/usr/lib64/nagios'
-$ng_log_dir         = '/var/log/nagios'
+$ng_log_dir           = '/var/log/nagios'
-$ng_log_archives    = "${ng_log_dir}/archives"
+$ng_log_archives      = "${ng_log_dir}/archives"
-$ng_spool_dir       = '/var/spool/nagios'
+$ng_spool_dir         = '/var/spool/nagios'
-$ng_usr_share       = '/usr/share/nagios'
+$ng_usr_share         = '/usr/share/nagios'
-$ng_share_html      = "${ng_usr_share}/html"
+$ng_share_html        = "${ng_usr_share}/html"
 
 # files
-$ng_main_config     = "${ng_main_dir}/nagios.cfg"
+$ng_main_config       = "${ng_main_dir}/nagios.cfg"
-$ng_cgi_cfg_file    = "${ng_main_dir}/cgi.cfg"
+$ng_cgi_cfg_file      = "${ng_main_dir}/cgi.cfg"
-$ng_cgi_cfg_erb     = 'cd_nagios/nagios/cgi_cfg.erb'
+$ng_cgi_cfg_erb       = 'cd_nagios/nagios/cgi_cfg.erb'
-$ng_htpasswd_file   = "${ng_main_dir}/passwd"
+$ng_htpasswd_file     = "${ng_main_dir}/passwd"
-$ng_htpasswd_head   = 'cd_nagios/nagios/htpasswd_head.erb'
+$ng_htpasswd_head     = 'cd_nagios/nagios/htpasswd_head.erb'
-$ng_htpasswd_rule   = 'cd_nagios/nagios/htpasswd_rule.erb'
+$ng_htpasswd_rule     = 'cd_nagios/nagios/htpasswd_rule.erb'
-$ng_taccgi_erb      = 'cd_nagios/selinux/taccgi.erb'
+$ng_taccgi_erb        = 'cd_nagios/selinux/taccgi.erb'
-$ng_statcgi_erb     = 'cd_nagios/selinux/statuscgi.erb'
+$ng_statcgi_erb       = 'cd_nagios/selinux/statuscgi.erb'
-$ng_nagios_conf     = '/etc/httpd/conf.d/nagios.conf'
+$ng_nagios_conf       = '/etc/httpd/conf.d/nagios.conf'
-$ng_nagios_conf_erb = 'cd_nagios/httpd/nagios_conf.erb'
+$ng_nagios_conf_erb   = 'cd_nagios/httpd/nagios_conf.erb'
+$ng_welcome_conf      ='/etc/httpd/conf.d/welcome.conf'
+$ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
 
 # includes must be last
 

manifests/server/files.pp

@@ -62,5 +62,24 @@ class cd_nagios::server::files (
       content   =>  template($ng_nagios_conf_erb),
       notify    =>  Service[$ae_service],
     }
+
+    # manage index.gtml for nagios web server
+
+    if $ng_disable_welcome == true {
+
+      file { $ng_welcome_conf:
+        ensure    =>  file,
+        path      =>  $ng_welcome_conf,
+        owner     =>  'root',
+        group     =>  'root',
+        mode      =>  '0644',
+        selrange  =>  s0,
+        selrole   =>  object_r,
+        seltype   =>  httpd_config_t,
+        seluser   =>  system_u,
+        content   =>  template($ng_welcome_conf_erb),
+        notify    =>  Service[$ae_service],
+      }
+    }
   }
 }

templates/httpd/welcome_conf.erb

@@ -0,0 +1,27 @@
+################################################################################
+###########             welcome.conf generated by Puppet              ##########
+###########             manual changes will be overwritten !!!        ##########
+################################################################################
+
+#
+# This configuration file enables the default "Welcome" page if there
+# is no default index page present for the root URL.  To disable the
+# Welcome page, comment out all the lines below.
+#
+# NOTE: if this file is removed, it will be restored on upgrades.
+#
+#<LocationMatch "^/+$">
+#    Options -Indexes
+#    ErrorDocument 403 /.noindex.html
+#</LocationMatch>
+
+#<Directory /usr/share/httpd/noindex>
+#    AllowOverride None
+#    Require all granted
+#</Directory>
+
+#Alias /.noindex.html /usr/share/httpd/noindex/index.html
+#Alias /noindex/css/bootstrap.min.css /usr/share/httpd/noindex/css/bootstrap.min.css
+#Alias /noindex/css/open-sans.css /usr/share/httpd/noindex/css/open-sans.css
+#Alias /images/apache_pb.gif /usr/share/httpd/noindex/images/apache_pb.gif
+#Alias /images/poweredby.png /usr/share/httpd/noindex/images/poweredby.png