Merge branch 'jenkins' into 'master'

Jenkins See merge request !2
2017-07-20 16:02:17 +02:00
parent 4c441a8e1f 030e5f68f5
commit 4f7ca0ad36
21 changed files with 66 additions and 27 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,14 @@ Changelog of Git Changelog.
 <h2> No issue </h2>


-<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/8db8758970310bf">8db8758970310bf</a> Arne Teuke <i>2017-07-20 13:31:19</i>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3a3e3ceef9a4a2f">3a3e3ceef9a4a2f</a> Jenkins Server <i>2017-07-20 13:47:46</i>
 <p>
-<h3>recommitting to see if git can be fixed</h3>
+<h3>recommit for updates in build 2</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/febc8f1a348f2e7">febc8f1a348f2e7</a> Arne Teuke <i>2017-07-20 13:47:24</i>
+<p>
+<h3>re-added all files</h3>

 </p>

--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -1,4 +1,34 @@
 .
+|-- doc
+|   |-- css
+|   |   |-- common.css
+|   |   |-- full_list.css
+|   |   `-- style.css
+|   |-- js
+|   |   |-- app.js
+|   |   |-- full_list.js
+|   |   `-- jquery.js
+|   |-- puppet_classes
+|   |   |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html
+|   |   |-- cd_nagios_3A_3Amain_3A_3Aconfig.html
+|   |   |-- cd_nagios_3A_3Amain_3A_3Adirs.html
+|   |   |-- cd_nagios_3A_3Amain_3A_3Ainstall.html
+|   |   |-- cd_nagios_3A_3Amain_3A_3Auser.html
+|   |   |-- cd_nagios_3A_3Aparams.html
+|   |   |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+|   |   |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+|   |   |-- cd_nagios_3A_3Aserver_3A_3Afiles.html
+|   |   |-- cd_nagios_3A_3Aserver_3A_3Aservice.html
+|   |   `-- cd_nagios.html
+|   |-- puppet_defined_types
+|   |   `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html
+|   |-- file.README.html
+|   |-- frames.html
+|   |-- _index.html
+|   |-- index.html
+|   |-- puppet_class_list.html
+|   |-- puppet_defined_type_list.html
+|   `-- top-level-namespace.html
 |-- manifests
 |   |-- client
 |   |   `-- target.pp
@@ -25,10 +55,14 @@
 |   |   `-- htpasswd_rule.erb
 |   `-- selinux
 |       `-- taccgi.erb
+|-- tests
+|   `-- UTF_Files
+|-- CHANGELOG.md
 |-- Gemfile
 |-- Gemfile.lock
 |-- Jenkinsfile
 |-- LICENSE
-`-- README.md
+|-- README.md
+`-- REPOSTRUCTURE.md

-9 directories, 22 files
+15 directories, 50 files
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -176,7 +176,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:40 2017 by
+  Generated on Thu Jul 20 16:11:07 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
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:41 2017 by
+  Generated on Thu Jul 20 16:11:08 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
@@ -297,7 +297,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:41 2017 by
+  Generated on Thu Jul 20 16:11:08 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 Thu Jul 20 15:47:41 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- 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 Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- 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 Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- 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 Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- 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 Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- 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 Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2135,7 +2135,7 @@ $ng_taccgi_erb    = &#39;cd_nagios/selinux/taccgi.erb&#39;
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -169,7 +169,7 @@ class cd_nagios::selinux::config (
      command     =&gt;  template($ng_taccgi_erb),
      path        =&gt;  [&#39;/usr/bin&#39;,&#39;/usr/sbin&#39;],
      cwd         =&gt;  &#39;/tmp&#39;,
-      creates     =&gt;  &#39;/tmp/my-taccgi&#39;,
+      creates     =&gt;  &#39;/tmp/my-taccgi.pp&#39;,
      notify      =&gt;  Exec[&#39;semodule_taccgi&#39;],
    }

@@ -189,7 +189,7 @@ class cd_nagios::selinux::config (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -166,7 +166,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 51
 52
 53
-54</pre>
+54
+55</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/access_rules.pp', line 28</span>
@@ -189,6 +190,7 @@ class cd_nagios::server::access_rules (
      selrole   =&gt;  object_r,
      seltype   =&gt;  nagios_etc_t,
      seluser   =&gt;  system_u,
+      notify    =&gt;  Service[$ng_service],
    }

    concat::fragment { &#39;create_header&#39;:
@@ -205,7 +207,7 @@ class cd_nagios::server::access_rules (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -196,7 +196,7 @@ class cd_nagios::server::files (
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- 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 Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -169,8 +169,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 37
 38
 39
-40
-41</pre>
+40</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/server/access.pp', line 23</span>
@@ -191,7 +190,6 @@ $ng_service       = $::cd_nagios::params::ng_service
  concat::fragment { $name:
    target  =&gt;  $ng_htpasswd_file,
    content =&gt;  template($ng_htpasswd_rule),
-    notify  =&gt;  Service[$ng_service],
  }
 }</pre>
      </td>
@@ -201,7 +199,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:43 2017 by
+  Generated on Thu Jul 20 16:11: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>
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 </div>

      <div id="footer">
-  Generated on Thu Jul 20 15:47:41 2017 by
+  Generated on Thu Jul 20 16:11:08 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/selinux/config.pp
+++ b/manifests/selinux/config.pp
@@ -32,7 +32,7 @@ class cd_nagios::selinux::config (
      command     =>  template($ng_taccgi_erb),
      path        =>  ['/usr/bin','/usr/sbin'],
      cwd         =>  '/tmp',
-      creates     =>  '/tmp/my-taccgi',
+      creates     =>  '/tmp/my-taccgi.pp',
      notify      =>  Exec['semodule_taccgi'],
    }

--- a/manifests/server/access.pp
+++ b/manifests/server/access.pp
@@ -36,6 +36,5 @@ $ng_service       = $::cd_nagios::params::ng_service
  concat::fragment { $name:
    target  =>  $ng_htpasswd_file,
    content =>  template($ng_htpasswd_rule),
-    notify  =>  Service[$ng_service],
  }
 }
--- a/manifests/server/access_rules.pp
+++ b/manifests/server/access_rules.pp
@@ -43,6 +43,7 @@ class cd_nagios::server::access_rules (
      selrole   =>  object_r,
      seltype   =>  nagios_etc_t,
      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
    }

    concat::fragment { 'create_header':