Merge branch 'jenkins' into 'master'

Jenkins See merge request !23
2017-07-21 18:19:24 +02:00
parent 0732684ea4 5d8c5cff03
commit fcbb5342b6
21 changed files with 88 additions and 21 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/d70df7efcba20a6">d70df7efcba20a6</a> Jenkins Server <i>2017-07-21 16:15:13</i>
+<p>
+<h3>recommit for updates in build 41</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/910a2e4fb87c5b3">910a2e4fb87c5b3</a> Arne Teuke <i>2017-07-21 16:14:54</i>
+<p>
+<h3>fixed relationship</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/7fff54ce74927d9">7fff54ce74927d9</a> Jenkins Server <i>2017-07-21 16:11:57</i>
 <p>
 <h3>recommit for updates in build 40</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -186,7 +186,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 18:15:07 2017 by
+  Generated on Fri Jul 21 18:28:33 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
@@ -304,7 +304,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 21 18:15:09 2017 by
+  Generated on Fri Jul 21 18:28: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/index.html
+++ b/doc/index.html
@@ -304,7 +304,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 21 18:15:08 2017 by
+  Generated on Fri Jul 21 18:28: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/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 18:15:09 2017 by
+  Generated on Fri Jul 21 18:28: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_3A_3Acertbot_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
@@ -168,7 +168,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 59
 60
 61
-62</pre>
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/certbot/config.pp', line 23</span>
@@ -183,6 +202,25 @@ class cd_nagios::certbot::config (

        require cd_certbot

+        # ensure there is no forward vhost file
+
+        exec { &#39;remove_forward_vhost&#39;:
+          command   =&gt;  &quot;rm -Rf ${ng_forward_conf}&quot;,
+          creates   =&gt;  &#39;/etc/httpd/conf.d/.cert_created&#39;,
+        }
+
+        exec { &#39;remove_nagios_conf&#39;:
+          command   =&gt;  &quot;rm -Rf ${ng_nagios_conf}&quot;,
+          creates   =&gt;  &#39;/etc/httpd/conf.d/.cert_created&#39;,
+          require   =&gt;  Exec[&#39;remove_forward_vhost&#39;],
+        }
+
+        exec { &#39;remove_index_html&#39;:
+          command   =&gt;  &quot;rm -Rf ${ng_index_html_file}&quot;,
+          creates   =&gt;  &#39;/etc/httpd/conf.d/.cert_created&#39;,
+          require   =&gt;  Exec[&#39;remove_nagios_conf&#39;],
+        }
+
        # create cert

        exec { &#39;create_cert&#39;:
@@ -220,7 +258,7 @@ class cd_nagios::certbot::config (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 18:15:11 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:11 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:11 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:10 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:10 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:10 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:10 2017 by
+  Generated on Fri Jul 21 18:28: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_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2312,7 +2312,7 @@ $ng_index_html_erb    = &#39;cd_nagios/httpd/index_html.erb&#39;
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 18:15:10 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:11 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:11 2017 by
+  Generated on Fri Jul 21 18:28: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_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -329,7 +329,7 @@ class cd_nagios::server::files (
        mode      =&gt;  &#39;0644&#39;,
        selrange  =&gt;  s0,
        selrole   =&gt;  object_r,
-        seltype   =&gt;  httpd_config_t,
+        seltype   =&gt;  httpd_sys_content_t,
        seluser   =&gt;  system_u,
        content   =&gt;  template($ng_index_html_erb),
        notify    =&gt;  Service[$ae_service],
@@ -344,7 +344,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 18:15:10 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:11 2017 by
+  Generated on Fri Jul 21 18:28: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_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 18:15:11 2017 by
+  Generated on Fri Jul 21 18:28: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/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 21 18:15:09 2017 by
+  Generated on Fri Jul 21 18:28: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/manifests/certbot/config.pp
+++ b/manifests/certbot/config.pp
@@ -30,6 +30,25 @@ class cd_nagios::certbot::config (

        require cd_certbot

+        # ensure there is no forward vhost file
+
+        exec { 'remove_forward_vhost':
+          command   =>  "rm -Rf ${ng_forward_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+        }
+
+        exec { 'remove_nagios_conf':
+          command   =>  "rm -Rf ${ng_nagios_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_forward_vhost'],
+        }
+
+        exec { 'remove_index_html':
+          command   =>  "rm -Rf ${ng_index_html_file}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_nagios_conf'],
+        }
+
        # create cert

        exec { 'create_cert':
--- a/manifests/server/files.pp
+++ b/manifests/server/files.pp
@@ -114,7 +114,7 @@ class cd_nagios::server::files (
        mode      =>  '0644',
        selrange  =>  s0,
        selrole   =>  object_r,
-        seltype   =>  httpd_config_t,
+        seltype   =>  httpd_sys_content_t,
        seluser   =>  system_u,
        content   =>  template($ng_index_html_erb),
        notify    =>  Service[$ae_service],