Merge branch 'jenkins' into 'master'

Jenkins See merge request !12
2017-07-21 15:34:11 +02:00
parent 090c2b3d3d 1fc9ffeacd
commit d8609065b8
24 changed files with 135 additions and 33 deletions
--- a/CHANGELOG.md
+++ b/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/00ef7138b378bf5">00ef7138b378bf5</a> Jenkins Server <i>2017-07-21 13:06:15</i>
+<p>
+<h3>recommit for updates in build 25</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/46d3b02f7625b15">46d3b02f7625b15</a> Arne Teuke <i>2017-07-21 13:05:55</i>
+<p>
+<h3>added control for welcome.conf</h3>
+
+</p>
 <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>
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ Configuration
 * configure NRPE on clients (optional)
 * configure firewall (optional)
 * configure selinux policies (optional)
+* configure forwarding http to https including accesing the /nagios url directly (optional)

 Service
 * manage Nagios service on server
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -51,6 +51,7 @@
 |   `-- params.pp
 |-- templates
 |   |-- httpd
+|   |   |-- forward_conf.erb
 |   |   |-- nagios_conf.erb
 |   |   `-- welcome_conf.erb
 |   |-- nagios
@@ -69,4 +70,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md

-16 directories, 53 files
+16 directories, 54 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -181,7 +181,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 15:06:09 2017 by
+  Generated on Fri Jul 21 15:43:20 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>
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -143,7 +143,9 @@ parameters
 configure NRPE on clients (optional)
 * configure firewall (optional)
 *
-configure selinux policies (optional)</p>
+configure selinux policies (optional)
+* configure forwarding http to https
+including accesing the /nagios url directly (optional)</p>

 <p>Service
 * manage Nagios service on server
@@ -297,7 +299,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 21 15:06:10 2017 by
+  Generated on Fri Jul 21 15:43:21 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>
--- a/doc/index.html
+++ b/doc/index.html
@@ -143,7 +143,9 @@ parameters
 configure NRPE on clients (optional)
 * configure firewall (optional)
 *
-configure selinux policies (optional)</p>
+configure selinux policies (optional)
+* configure forwarding http to https
+including accesing the /nagios url directly (optional)</p>

 <p>Service
 * manage Nagios service on server
@@ -297,7 +299,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 21 15:06:09 2017 by
+  Generated on Fri Jul 21 15:43:20 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>
--- a/doc/puppet_classes/cd_nagios.html
+++ b/doc/puppet_classes/cd_nagios.html
@@ -139,7 +139,7 @@ class cd_nagios {
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 15:06:10 2017 by
+  Generated on Fri Jul 21 15:43:21 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
+++ b/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 15:06:11 2017 by
+  Generated on Fri Jul 21 15:43:22 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:22 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -1859,12 +1859,20 @@ Requires format &#39;ipaddress ip address range&#39;</p>
        <span class='name'>ng_disable_welcome</span>
      
      
-        <span class='type'>(<tt>Any</tt>)</span>
+        <span class='type'>(<tt>boolean</tt>)</span>
      
      
        <em class="default">(defaults to: <tt>true</tt>)</em>
      
      
+        &mdash;
+        <div class='inline'>
+<p>Whether the regular welcome screen should
+be disabled. this is required for
+the nagios http check on the nagios server
+ to be successful.</p>
+</div>
+      
    </li>
  
 </ul>
@@ -1884,9 +1892,6 @@ Requires format &#39;ipaddress ip address range&#39;</p>
        <pre class="lines">


-203
-204
-205
 206
 207
 208
@@ -2043,10 +2048,17 @@ Requires format &#39;ipaddress ip address range&#39;</p>
 359
 360
 361
-362</pre>
+362
+363
+364
+365
+366
+367
+368
+369</pre>
      </td>
      <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 203</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 206</span>

 class cd_nagios::params (

@@ -2158,6 +2170,7 @@ $ng_use_selinux_tools = true,
 $ng_required_hosts    = &#39;&#39;,
 $ng_required_ips      = &#39;127.0.0.0/8&#39;,
 $ng_disable_welcome   = true,
+
 ) {

 # installation section
@@ -2200,8 +2213,11 @@ $ng_taccgi_erb        = &#39;cd_nagios/selinux/taccgi.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;
-$ng_welcome_conf      =&#39;/etc/httpd/conf.d/welcome.conf&#39;
+$ng_welcome_conf      = &#39;/etc/httpd/conf.d/welcome.conf&#39;
 $ng_welcome_conf_erb  = &#39;cd_nagios/httpd/welcome_conf.erb&#39;
+$ng_forward_conf      = &#39;/etc/httpd/conf.d/nagios_forward.conf&#39;
+$ng_forward_conf_erb  = &#39;cd_nagios/httpd/forward_conf.erb&#39;
+

 # includes must be last

@@ -2215,7 +2231,7 @@ $ng_welcome_conf_erb  = &#39;cd_nagios/httpd/welcome_conf.erb&#39;
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 15:06:11 2017 by
+  Generated on Fri Jul 21 15:43:22 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -191,7 +191,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 82
 83
 84
-85</pre>
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 23</span>
@@ -239,7 +256,24 @@ class cd_nagios::server::files (
      notify    =&gt;  Service[$ae_service],
    }

-    # manage index.gtml for nagios web server
+    if $ng_http_https_fw == true {
+
+      file { $ng_forward_conf:
+        ensure    =&gt;  file,
+        path      =&gt;  $ng_forward_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_forward_conf_erb),
+        notify    =&gt;  Service[$ae_service],
+      }
+    }
+
+    # manage welcome.conf for nagios web server

    if $ng_disable_welcome == true {

@@ -266,7 +300,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/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 15:06:12 2017 by
+  Generated on Fri Jul 21 15:43:23 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>
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 15:06:10 2017 by
+  Generated on Fri Jul 21 15:43:21 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>
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -199,6 +199,9 @@
 #   'host1.example.com host2.example.com'
 # @param  [string] ng_required_ips string of **__Ip addresses __** for hosts which
 #   should be allowed/reqired. Requires format 'ipaddress ip address range'
+# @param  [boolean] ng_disable_welcome Whether the regular welcome screen should
+#   be disabled. this is required for the nagios http check on the nagios server
+#    to be successful.
 ###############################################################################
 class cd_nagios::params (

@@ -310,6 +313,7 @@ $ng_use_selinux_tools = true,
 $ng_required_hosts    = '',
 $ng_required_ips      = '127.0.0.0/8',
 $ng_disable_welcome   = true,
+
 ) {

 # installation section
@@ -352,8 +356,11 @@ $ng_taccgi_erb        = 'cd_nagios/selinux/taccgi.erb'
 $ng_statcgi_erb       = 'cd_nagios/selinux/statuscgi.erb'
 $ng_nagios_conf       = '/etc/httpd/conf.d/nagios.conf'
 $ng_nagios_conf_erb   = 'cd_nagios/httpd/nagios_conf.erb'
-$ng_welcome_conf      ='/etc/httpd/conf.d/welcome.conf'
+$ng_welcome_conf      = '/etc/httpd/conf.d/welcome.conf'
 $ng_welcome_conf_erb  = 'cd_nagios/httpd/welcome_conf.erb'
+$ng_forward_conf      = '/etc/httpd/conf.d/nagios_forward.conf'
+$ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
+

 # includes must be last

--- a/manifests/server/files.pp
+++ b/manifests/server/files.pp
@@ -63,7 +63,24 @@ class cd_nagios::server::files (
      notify    =>  Service[$ae_service],
    }

-    # manage index.gtml for nagios web server
+    if $ng_http_https_fw == true {
+
+      file { $ng_forward_conf:
+        ensure    =>  file,
+        path      =>  $ng_forward_conf,
+        owner     =>  'root',
+        group     =>  'root',
+        mode      =>  '0644',
+        selrange  =>  s0,
+        selrole   =>  object_r,
+        seltype   =>  httpd_config_t,
+        seluser   =>  system_u,
+        content   =>  template($ng_forward_conf_erb),
+        notify    =>  Service[$ae_service],
+      }
+    }
+
+    # manage welcome.conf for nagios web server

    if $ng_disable_welcome == true {

--- a/templates/httpd/forward_conf.erb
+++ b/templates/httpd/forward_conf.erb
@@ -0,0 +1,12 @@
+<VirtualHost *:80>
+    ServerAdmin root@localhost
+    DocumentRoot /var/www/html
+    ServerName www.<%= @ng_nagios_server %>
+    ServerAlias <%= @ng_nagios_server %>
+    Redirect permanent / https://<%= @ng_nagios_server %>/nagios
+    <Directory />
+    AllowOverride All
+    </Directory>
+    ErrorLog /var/log/httpd/<%= @ng_nagios_server %>-error_log
+    CustomLog /var/log/httpd/<%= @ng_nagios_server %>-access_log common
+</VirtualHost>
--- a/templates/httpd/nagios_conf.erb
+++ b/templates/httpd/nagios_conf.erb
@@ -23,7 +23,7 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/"
    Require host <%= @ng_required_hosts %>
 <% end -%>
 <% unless @ng_required_ips.empty? -%>
-         Require ip <%= required_ips %>
+         Require ip <%= @ng_required_ip %>
 <% end -%>
         AuthName "Nagios Access"
         AuthType Basic
@@ -58,7 +58,7 @@ Alias /nagios "/usr/share/nagios/html"
    Require host <%= @ng_required_hosts %>
 <% end -%>
 <% unless @ng_required_ips.empty? -%>
-         Require ip <%= required_ips %>
+         Require ip <%= @ng_required_ip %>
 <% end -%>
         AuthName "Nagios Access"
         AuthType Basic