Merge branch 'jenkins' into 'master'

Jenkins See merge request !6
2017-08-03 16:59:58 +02:00
parent 378f204d21 6f0942201f
commit d00319fe55
13 changed files with 23 additions and 13 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/8c3df7530a1ab21">8c3df7530a1ab21</a> Arne Teuke <i>2017-08-03 14:51:29</i>
+<p>
+<h3>added controls for main conf/local files</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/21086d1f714fd6a">21086d1f714fd6a</a> Jenkins Server <i>2017-08-03 14:51:10</i>
+<p>
+<h3>recommit for updates in build 8</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/202c50762d6411e">202c50762d6411e</a> Arne Teuke <i>2017-08-03 14:29:17</i>
 <p>
 <h3>added controls for main conf/local files</h3>
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -132,7 +132,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:06 2017 by
+  Generated on Thu Aug  3 16:55: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/file.README.html
+++ b/doc/file.README.html
@@ -251,7 +251,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:07 2017 by
+  Generated on Thu Aug  3 16:55: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
@@ -251,7 +251,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:07 2017 by
+  Generated on Thu Aug  3 16:55: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_fail2ban.html
+++ b/doc/puppet_classes/cd_fail2ban.html
@@ -139,7 +139,7 @@ class cd_fail2ban {
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:08 2017 by
+  Generated on Thu Aug  3 16:55: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_fail2ban_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html
@@ -153,7 +153,7 @@ class cd_fail2ban::main::config (
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:08 2017 by
+  Generated on Thu Aug  3 16:55: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_fail2ban_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html
@@ -350,7 +350,7 @@ class cd_fail2ban::main::dirs (
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:08 2017 by
+  Generated on Thu Aug  3 16:55: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_fail2ban_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html
@@ -209,7 +209,7 @@ class cd_fail2ban::main::files (
      selrole   =&gt;  object_r,
      seltype   =&gt;  etc_t,
      seluser   =&gt;  system_u,
-      content   =&gt;  template($fn_fail2ban_conf_erb),
+      content   =&gt;  template($fn_fail2ban_local_erb),
      notify    =&gt;  Service[$fn_service],
    }

@@ -222,7 +222,7 @@ class cd_fail2ban::main::files (
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:08 2017 by
+  Generated on Thu Aug  3 16:55: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_fail2ban_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html
@@ -159,7 +159,7 @@ class cd_fail2ban::main::install (
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:08 2017 by
+  Generated on Thu Aug  3 16:55: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_fail2ban_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html
@@ -166,7 +166,7 @@ class cd_fail2ban::main::service (
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:08 2017 by
+  Generated on Thu Aug  3 16:55: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_fail2ban_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html
@@ -454,7 +454,7 @@ $fn_fail2ban_local_erb  = &#39;cd_fail2ban/fail2ban_local.erb&#39;
 </div>

      <div id="footer">
-  Generated on Thu Aug  3 16:51:08 2017 by
+  Generated on Thu Aug  3 16:55: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 Thu Aug  3 16:51:07 2017 by
+  Generated on Thu Aug  3 16:55: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/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -56,7 +56,7 @@ class cd_fail2ban::main::files (
      selrole   =>  object_r,
      seltype   =>  etc_t,
      seluser   =>  system_u,
-      content   =>  template($fn_fail2ban_conf_erb),
+      content   =>  template($fn_fail2ban_local_erb),
      notify    =>  Service[$fn_service],
    }