Merge branch 'jenkins' into 'master'

Jenkins See merge request !10
2017-07-28 18:44:13 +02:00
parent cb95604979 af92ee8bd6
commit cc0fabb4c2
19 changed files with 128 additions and 31 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/09c00735a0a8080">09c00735a0a8080</a> Jenkins Server <i>2017-07-28 16:41:56</i>
+<p>
+<h3>recommit for updates in build 19</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/3c9c5ee77845af6">3c9c5ee77845af6</a> Arne Teuke <i>2017-07-28 16:41:54</i>
+<p>
+<h3>fixed teh right file this time</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/0d8aaec9b34a306">0d8aaec9b34a306</a> Arne Teuke <i>2017-07-28 16:35:40</i>
 <p>
 <h3>typo</h3>
--- a/README.md
+++ b/README.md
@@ -34,10 +34,14 @@ INSTALLATION

 CONFIGURATION
 * manage NRPE service user properties
-* manage directory structure (file system permissions, selinux context)
-*
+* manage directory structure (file system permissions, selinux context) through parameters
+* manage configuration files through parameters:
+  * nrpe.conf
+  * nrpe.cfg
+* manage iptables (optionals )

 SERVICE
+* manage NRPE service

 ### Repo Structure
 Repostructure has moved to REPOSTRUCTURE.md in repo.
@@ -46,6 +50,7 @@ Repostructure has moved to REPOSTRUCTURE.md in repo.
 All dependencies must be included in the catalogue.

 * [cd_resources](https://gitlab.puppetsoft.com/12WW1160/cd_resources) to manage YUM repositories.
+* [cd_firewall](https://gitlab.puppetsoft.com/12WW1160/cd_firewall) or [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall)  to manage iptables
 * [cd_stdlib](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat
 * [cd_concat](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib)  or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) for concatenating files

--- a/doc/_index.html
+++ b/doc/_index.html
@@ -166,7 +166,7 @@
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:52 2017 by
+  Generated on Fri Jul 28 18:54:32 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
@@ -125,10 +125,16 @@ href="https://gitlab.puppetsoft.com/12WW1160/cd_nrpe/blob/master/CHANGELOG.md">C
 <p>CONFIGURATION
 * manage NRPE service user properties
 * manage directory
-structure (file system permissions, selinux context)
-*</p>
+structure (file system permissions, selinux context) through parameters
+*
+manage configuration files through parameters:
+ * nrpe.conf
+ * nrpe.cfg
+*
+manage iptables (optionals )</p>

-<p>SERVICE</p>
+<p>SERVICE
+* manage NRPE service</p>

 <h3 id="label-Repo+Structure">Repo Structure</h3>

@@ -142,6 +148,11 @@ structure (file system permissions, selinux context)
 href="https://gitlab.puppetsoft.com/12WW1160/cd_resources">cd_resources</a>
 to manage YUM repositories.</p>
 </li><li>
+<p><a
+href="https://gitlab.puppetsoft.com/12WW1160/cd_firewall">cd_firewall</a>
+or <a href="https://github.com/puppetlabs/puppetlabs-firewall">puppetlabs
+firewall</a> to manage iptables</p>
+</li><li>
 <p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_stdlib">cd_stdlib</a> or
 <a href="https://github.com/puppetlabs/puppetlabs-stdlib">puppetlabs
 stdlib</a> to facilitate concat</p>
@@ -241,7 +252,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:53 2017 by
+  Generated on Fri Jul 28 18:54: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/index.html
+++ b/doc/index.html
@@ -125,10 +125,16 @@ href="https://gitlab.puppetsoft.com/12WW1160/cd_nrpe/blob/master/CHANGELOG.md">C
 <p>CONFIGURATION
 * manage NRPE service user properties
 * manage directory
-structure (file system permissions, selinux context)
-*</p>
+structure (file system permissions, selinux context) through parameters
+*
+manage configuration files through parameters:
+ * nrpe.conf
+ * nrpe.cfg
+*
+manage iptables (optionals )</p>

-<p>SERVICE</p>
+<p>SERVICE
+* manage NRPE service</p>

 <h3 id="label-Repo+Structure">Repo Structure</h3>

@@ -142,6 +148,11 @@ structure (file system permissions, selinux context)
 href="https://gitlab.puppetsoft.com/12WW1160/cd_resources">cd_resources</a>
 to manage YUM repositories.</p>
 </li><li>
+<p><a
+href="https://gitlab.puppetsoft.com/12WW1160/cd_firewall">cd_firewall</a>
+or <a href="https://github.com/puppetlabs/puppetlabs-firewall">puppetlabs
+firewall</a> to manage iptables</p>
+</li><li>
 <p><a href="https://gitlab.puppetsoft.com/12WW1160/cd_stdlib">cd_stdlib</a> or
 <a href="https://github.com/puppetlabs/puppetlabs-stdlib">puppetlabs
 stdlib</a> to facilitate concat</p>
@@ -241,7 +252,7 @@ environments.</p>
 </div></div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:53 2017 by
+  Generated on Fri Jul 28 18:54: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/puppet_classes/cd_nrpe.html
+++ b/doc/puppet_classes/cd_nrpe.html
@@ -140,7 +140,7 @@ class cd_nrpe {
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:53 2017 by
+  Generated on Fri Jul 28 18:54: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/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html
@@ -165,7 +165,7 @@ class cd_nrpe::firewall::iptables (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_nrpe_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html
@@ -154,7 +154,7 @@ class cd_nrpe::main::config (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_nrpe_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html
@@ -205,7 +205,7 @@ class cd_nrpe::main::dirs (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_nrpe_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html
@@ -148,7 +148,25 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 40
 41
 42
-43</pre>
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 23</span>
@@ -159,6 +177,8 @@ class cd_nrpe::main::files (

  require cd_nrpe::main::dirs

+  # manage /etc/nagios/nrpe.cfg
+
  file { $ne_main_conf_file:
    ensure    =&gt;  file,
    path      =&gt;  $ne_main_conf_file,
@@ -169,6 +189,22 @@ class cd_nrpe::main::files (
    selrole   =&gt;  object_r,
    seltype   =&gt;  nrpe_etc_t,
    seluser   =&gt;  system_u,
+    content   =&gt;  template($ne_main_conf_erb),
+    notify    =&gt;  Service[$ne_service],
+  }
+
+  # manage /etc/sysconfig/nrpe
+
+  file { $ne_nrpe_conf_file:
+    ensure    =&gt;  file,
+    path      =&gt;  $ne_nrpe_conf_file,
+    owner     =&gt;  &#39;root&#39;,
+    group     =&gt;  &#39;root&#39;,
+    mode      =&gt;  &#39;0640&#39;,
+    selrange  =&gt;  s0,
+    selrole   =&gt;  object_r,
+    seltype   =&gt;  etc_t,
+    seluser   =&gt;  system_u,
    content   =&gt;  template($ne_nrpe_conf_erb),
    notify    =&gt;  Service[$ne_service],
  }
@@ -181,7 +217,7 @@ class cd_nrpe::main::files (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_nrpe_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html
@@ -160,7 +160,7 @@ class cd_nrpe::main::install (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_nrpe_3A_3Amain_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html
@@ -158,7 +158,7 @@ class cd_nrpe::main::service (
    require cd_nrpe::firewall::iptables
  }

-  require cd_nrpe::main::files
+  require cd_nrpe::main::install

  service { $ne_service:
    ensure      =&gt; running,
@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_nrpe_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html
@@ -193,7 +193,7 @@ class cd_nrpe::main::user (
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_nrpe_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html
@@ -596,7 +596,7 @@ one
        <span class='type'>(<tt>string</tt>)</span>
      
      
-        <em class="default">(defaults to: <tt>&#39;\&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;</tt>)</em>
      
      
        &mdash;
@@ -906,7 +906,9 @@ needed.</p>
 159
 160
 161
-162</pre>
+162
+163
+164</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 90</span>
@@ -946,7 +948,7 @@ $ne_ssl_cert_file           = &quot;/etc/pki/tls/certs/${::fqdn}.crt.pem&quot;,
 $ne_ssl_privatekey_file     = &quot;/etc/pki/tls/private/${::fqdn}.key.pem&quot;,
 $ne_ssl_client_certs        = &#39;2&#39;,
 $ne_ssl_logging             = &#39;0x00&#39;,
-$ne_nasty_metachars         = &#39;\&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;,
+$ne_nasty_metachars         = &#39;&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;,
 $ne_include_file            = &#39;&#39;,

 # nrpe.conf
@@ -976,8 +978,10 @@ $ne_run_dir                 = &#39;/var/run/nrpe&#39;

 # files
 $ne_main_conf_file          = &#39;/etc/nagios/nrpe.cfg&#39;
-$ne_nrpe_conf_erb           = &#39;cd_nrpe/nrpe_cfg.erb&#39;
+$ne_main_conf_erb           = &#39;cd_nrpe/nrpe_cfg.erb&#39;
 $ne_nrpe_pid_file           = &quot;${ne_run_dir}/nrpe.pid&quot;
+$ne_nrpe_conf_file          = &#39;/etc/sysconfig/nrpe&#39;
+$ne_nrpe_conf_erb           = &#39;cd_nrpe/nrpe_conf.erb&#39;

 # includes must be last

@@ -991,7 +995,7 @@ $ne_nrpe_pid_file           = &quot;${ne_run_dir}/nrpe.pid&quot;
 </div>

      <div id="footer">
-  Generated on Fri Jul 28 18:41:54 2017 by
+  Generated on Fri Jul 28 18:54: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_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
+++ b/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
@@ -148,7 +148,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 </div>

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

      <div id="footer">
-  Generated on Fri Jul 28 18:41:53 2017 by
+  Generated on Fri Jul 28 18:54: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/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -26,6 +26,8 @@ class cd_nrpe::main::files (

  require cd_nrpe::main::dirs

+  # manage /etc/nagios/nrpe.cfg
+
  file { $ne_main_conf_file:
    ensure    =>  file,
    path      =>  $ne_main_conf_file,
@@ -36,6 +38,22 @@ class cd_nrpe::main::files (
    selrole   =>  object_r,
    seltype   =>  nrpe_etc_t,
    seluser   =>  system_u,
+    content   =>  template($ne_main_conf_erb),
+    notify    =>  Service[$ne_service],
+  }
+
+  # manage /etc/sysconfig/nrpe
+
+  file { $ne_nrpe_conf_file:
+    ensure    =>  file,
+    path      =>  $ne_nrpe_conf_file,
+    owner     =>  'root',
+    group     =>  'root',
+    mode      =>  '0640',
+    selrange  =>  s0,
+    selrole   =>  object_r,
+    seltype   =>  etc_t,
+    seluser   =>  system_u,
    content   =>  template($ne_nrpe_conf_erb),
    notify    =>  Service[$ne_service],
  }
--- a/manifests/main/service.pp
+++ b/manifests/main/service.pp
@@ -28,7 +28,7 @@ class cd_nrpe::main::service (
    require cd_nrpe::firewall::iptables
  }

-  require cd_nrpe::main::files
+  require cd_nrpe::main::install

  service { $ne_service:
    ensure      => running,
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -122,7 +122,7 @@ $ne_ssl_cert_file           = "/etc/pki/tls/certs/${::fqdn}.crt.pem",
 $ne_ssl_privatekey_file     = "/etc/pki/tls/private/${::fqdn}.key.pem",
 $ne_ssl_client_certs        = '2',
 $ne_ssl_logging             = '0x00',
-$ne_nasty_metachars         = '\"|`&><\'\\[]{};\r\n\"',
+$ne_nasty_metachars         = '"|`&><\'\\[]{};\r\n\"',
 $ne_include_file            = '',

 # nrpe.conf
@@ -152,8 +152,10 @@ $ne_run_dir                 = '/var/run/nrpe'

 # files
 $ne_main_conf_file          = '/etc/nagios/nrpe.cfg'
-$ne_nrpe_conf_erb           = 'cd_nrpe/nrpe_cfg.erb'
+$ne_main_conf_erb           = 'cd_nrpe/nrpe_cfg.erb'
 $ne_nrpe_pid_file           = "${ne_run_dir}/nrpe.pid"
+$ne_nrpe_conf_file          = '/etc/sysconfig/nrpe'
+$ne_nrpe_conf_erb           = 'cd_nrpe/nrpe_conf.erb'

 # includes must be last