Merge branch 'jenkins' into 'master'

Jenkins See merge request !41
2017-07-24 13:02:26 +02:00
parent 781ff40dda 5ff13eb485
commit f0fe90fa8d
21 changed files with 29 additions and 20 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/0812a3559d254ee">0812a3559d254ee</a> Jenkins Server <i>2017-07-23 13:13:13</i>
+<p>
+<h3>recommit for updates in build 64</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/92015e6a78305c7">92015e6a78305c7</a> Arne Teuke <i>2017-07-23 13:13:02</i>
+<p>
+<h3>forwarding is workg properly now</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f8c596b9bcca053">f8c596b9bcca053</a> Jenkins Server <i>2017-07-23 12:32:43</i>
 <p>
 <h3>recommit for updates in build 63</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 </div>

      <div id="footer">
-  Generated on Sun Jul 23 15:13:07 2017 by
+  Generated on Mon Jul 24 13:07:34 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
@@ -331,7 +331,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Sun Jul 23 15:13:09 2017 by
+  Generated on Mon Jul 24 13:07:36 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
@@ -331,7 +331,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Sun Jul 23 15:13:08 2017 by
+  Generated on Mon Jul 24 13:07:35 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 Sun Jul 23 15:13:09 2017 by
+  Generated on Mon Jul 24 13:07:36 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_3Acertbot_3A_3Acerts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 </div>

      <div id="footer">
-  Generated on Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:38 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 Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:38 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 Sun Jul 23 15:13:11 2017 by
+  Generated on Mon Jul 24 13:07:38 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
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 </div>

      <div id="footer">
-  Generated on Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:37 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 Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:37 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 Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:37 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 Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:37 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
@@ -2356,7 +2356,7 @@ $ng_certbot_live      = &quot;${ng_certbot_main_dir}/live&quot;
 </div>

      <div id="footer">
-  Generated on Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:37 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 Sun Jul 23 15:13:11 2017 by
+  Generated on Mon Jul 24 13:07:38 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 Sun Jul 23 15:13:11 2017 by
+  Generated on Mon Jul 24 13:07:38 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
@@ -324,7 +324,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Sun Jul 23 15:13:10 2017 by
+  Generated on Mon Jul 24 13:07:38 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 Sun Jul 23 15:13:11 2017 by
+  Generated on Mon Jul 24 13:07:38 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 Sun Jul 23 15:13:11 2017 by
+  Generated on Mon Jul 24 13:07:38 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 Sun Jul 23 15:13:09 2017 by
+  Generated on Mon Jul 24 13:07:36 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/templates/httpd/forward_conf.erb
+++ b/templates/httpd/forward_conf.erb
@@ -4,7 +4,7 @@
    ServerName www.<%= @ng_webserver_name %>/nagios
    ServerAlias <%= @ng_webserver_name %>
 <% if @ng_use_https == true -%>
-    Redirect permanent / https://<%= @ng_webserver_name %>/nagios
+    Redirect permanent / https://<%= @ng_webserver_name %>/
 <% end -%>
 <% if @ng_use_https != true -%>

--- a/templates/httpd/nagios_ssl_vhost.erb
+++ b/templates/httpd/nagios_ssl_vhost.erb
@@ -115,7 +115,6 @@ Alias /nagios "/usr/share/nagios/html"

 RedirectMatch ^/$ https://<%= @ng_webserver_name %>/nagios

-
    SetEnvIf User-Agent ".*MSIE.*" \
         nokeepalive ssl-unclean-shutdown \
         downgrade-1.0 force-response-1.0