Merge branch 'jenkins' into 'master'

Jenkins

See merge request !9

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/0d8aaec9b34a306">0d8aaec9b34a306</a> Arne Teuke <i>2017-07-28 16:35:40</i>
+<p>
+<h3>typo</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/fa2a6a350af81c9">fa2a6a350af81c9</a> Jenkins Server <i>2017-07-28 16:35:35</i>
+<p>
+<h3>recommit for updates in build 18</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e39182bc9aea67b">e39182bc9aea67b</a> Arne Teuke <i>2017-07-28 16:31:53</i>
 <p>
 <h3>typo</h3>

REPOSTRUCTURE.md

@@ -45,7 +45,7 @@
 |   `-- params.pp
 |-- templates
 |   |-- nrpe_cfg.erb
-|   `-- nrpe_cfg_head.erb
+|   `-- nrpe_conf.erb
 |-- tests
 |   `-- UTF_Files
 |-- CHANGELOG.md

doc/_index.html

@@ -166,7 +166,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 18:35:32 2017 by
+  Generated on Fri Jul 28 18:41:52 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>

doc/file.README.html

@@ -241,7 +241,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 28 18:35:33 2017 by
+  Generated on Fri Jul 28 18:41:53 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>

doc/index.html

@@ -241,7 +241,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Jul 28 18:35:32 2017 by
+  Generated on Fri Jul 28 18:41:53 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>

doc/puppet_classes/cd_nrpe.html

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

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:35:34 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

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:35:33 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

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:35:33 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html

@@ -181,7 +181,7 @@ class cd_nrpe::main::files (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 18:35:33 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

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:35:34 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html

@@ -175,7 +175,7 @@ class cd_nrpe::main::service (
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 18:35:34 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

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:35:33 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

doc/puppet_classes/cd_nrpe_3A_3Aparams.html

@@ -650,12 +650,30 @@ config file.</p>
         &mdash;
         <div class='inline'>
 <p>ordering prefix for he firewall rules. Adjust
-to yoru environment if
+to your environment if
 needed.</p>
 </div>
       
     </li>
   
+    <li>
+      
+        <span class='name'>ne_ssl_opts</span>
+      
+      
+        <span class='type'>(<tt>string</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Specify additional SSL options.</p>
+</div>
+      
+    </li>
+  
     <li>
       
         <span class='name'>ne_user</span>
@@ -802,6 +820,13 @@ needed.</p>
 </ul>
 
 
+  <p class="tag_title">See Also:</p>
+  <ul class="see">
+    
+      <li><a href="https://www.nagios.org/documentation/" target="_parent" title="https://www.nagios.org/documentation/">https://www.nagios.org/documentation/</a></li>
+    
+  </ul>
+
 </div><div class="method_details_list">
   <table class="source_code">
     <tr>
@@ -809,8 +834,6 @@ needed.</p>
         <pre class="lines">
 
 
-88
-89
 90
 91
 92
@@ -878,10 +901,15 @@ needed.</p>
 154
 155
 156
-157</pre>
+157
+158
+159
+160
+161
+162</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 88</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 90</span>
 
 class cd_nrpe::params (
 
@@ -921,6 +949,9 @@ $ne_ssl_logging             = &#39;0x00&#39;,
 $ne_nasty_metachars         = &#39;\&quot;|`&amp;&gt;&lt;\&#39;\\[]{};\r\n\&quot;&#39;,
 $ne_include_file            = &#39;&#39;,
 
+# nrpe.conf
+$ne_ssl_opts                = &#39;&#39;,
+
 # firewall
 $ne_incl_fw                 = true,
 $ne_fw_order_no             = &#39;50&#39;,
@@ -960,7 +991,7 @@ $ne_nrpe_pid_file           = &quot;${ne_run_dir}/nrpe.pid&quot;
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 18:35:33 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

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:35:34 2017 by
+  Generated on Fri Jul 28 18:41:54 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>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Jul 28 18:35:33 2017 by
+  Generated on Fri Jul 28 18:41:53 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>

manifests/params.pp

@@ -20,6 +20,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # @summary  Class holds all parameters for the cd_nrpe module and is
 #   inherited by all classes except defines.
+# @see https://www.nagios.org/documentation/
 # @param  [string] pkg_ensure
 #   which [package type](https://confdroid.com/2017/05/puppet-type-package/)
 #   to choose, i.e. `latest` or `present`.
@@ -83,7 +84,8 @@
 #   config file.
 # @param  [string] ne_include_dir
 # @param  [string] ne_fw_order_no ordering prefix for he firewall rules. Adjust
-#   to yoru environment if needed.
+#   to your environment if needed.
+# @param  [string] ne_ssl_opts Specify additional SSL options.
 ###############################################################################
 class cd_nrpe::params (
 
@@ -123,6 +125,9 @@ $ne_ssl_logging             = '0x00',
 $ne_nasty_metachars         = '\"|`&><\'\\[]{};\r\n\"',
 $ne_include_file            = '',
 
+# nrpe.conf
+$ne_ssl_opts                = '',
+
 # firewall
 $ne_incl_fw                 = true,
 $ne_fw_order_no             = '50',

templates/nrpe_cfg.erb

@@ -14,7 +14,7 @@ log_file=<%= @ne_log_file %>
 
 debug=<%= @ne_debug %>
 
-pid_file=<% @ne_nrpe_pid_file %>
+pid_file=<%= @ne_nrpe_pid_file %>
 server_port=<%= @ne_nrpe_port %>
 
 server_address=<%= @ne_server_address %>
@@ -47,7 +47,7 @@ ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>
 ssl_client_certs=<%= @ne_ssl_client_certs %>
 ssl_logging=<%= @ne_ssl_logging %>
 
-nasty_metachars=<$= @ne_nasty_metachars  %>
+nasty_metachars=<%= @ne_nasty_metachars  %>
 
 <% unless @ne_include_file.empty? -%>
 include=<%= @ne_include_file %>

templates/nrpe_cfg_head.erb

@@ -1,59 +0,0 @@
-################################################################################
-##########                nrpe.cfg managed by Puppet                  ##########
-##########            manual changes will be overwritten !!!          ##########
-################################################################################
-##########          full reference is available at                    ##########
-##########      https://confdroid.com/2017/07/nrpe-nrpe-cfg/          ##########
-################################################################################
-
-log_facility=<%= @ne_log_facility %>
-
-<% unless @ne_log_file.empty? -%>
-log_file=<%= @ne_log_file %>
-<% end -%>
-
-debug=<%= @ne_debug %>
-
-pid_file=<%= @ne_nrpe_pid_file %>
-server_port=<%= @ne_nrpe_port %>
-
-server_address=<%= @ne_server_address %>
-listen_queue_size=<%= @ne_listen_queue_size %>
-
-nrpe_user=<%= @ne_user %>
-nrpe_group=<%= @ne_user %>
-
-allowed_hosts=127.0.0.1,::1,<%= @ne_nagios_server %>
-dont_blame_nrpe=<%= @ne_dont_blame_nrpe %>
-allow_bash_command_substitution=<%= @ne_allow_bash_cmd_subst %>
-
-<% if @ne_allow_sudo == true -%>
-command_prefix=<%= @ne_command_prefix %>
-<% end -%>
-
-command_timeout=<%= @ne_command_timeout %>
-connection_timeout=<%= @ne_connection_timeout %>
-
-allow_weak_random_seed=<%= @ne_allow_weak_rnd_seed %>
-
-ssl_version=<%= @ne_ssl_version %>
-ssl_use_adh=<%= @ne_ssl_use_adh %>
-ssl_cipher_list=<%= @ne_ssl_cipher_list %>
-
-ssl_cacert_file=<%= @ne_ssl_cacert_file %>
-ssl_cert_file=<%= @ne_ssl_cert_file %>
-ssl_privatekey_file=<%= @ne_ssl_privatekey_file %>
-
-ssl_client_certs=<%= @ne_ssl_client_certs %>
-ssl_logging=<%= @ne_ssl_logging %>
-
-nasty_metachars=<%= @ne_nasty_metachars  %>
-
-<% unless @ne_include_file.empty? -%>
-include=<%= @ne_include_file %>
-<% end -%>
-
-include_dir=<%= @ne_main_conf_d_dir  %>
-
-### command definitions have been moved to include_dir for easier external
-#   management

templates/nrpe_conf.erb

@@ -0,0 +1,2 @@
+# specify additional command line arguments for nrpe
+NRPE_SSL_OPT=""