From 3c9c5ee77845af630fdf8a96d3cbc565381846ce Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 28 Jul 2017 17:41:54 +0100 Subject: [PATCH 1/2] fixed teh right file this time --- manifests/params.pp | 7 ++++- templates/nrpe_cfg.erb | 4 +-- templates/nrpe_cfg_head.erb | 59 ------------------------------------- templates/nrpe_conf.erb | 2 ++ 4 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 templates/nrpe_cfg_head.erb create mode 100644 templates/nrpe_conf.erb diff --git a/manifests/params.pp b/manifests/params.pp index 7e3bffb..b7d4858 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -20,6 +20,7 @@ # along with this program. If not, see . # @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', diff --git a/templates/nrpe_cfg.erb b/templates/nrpe_cfg.erb index c3a931d..150652f 100644 --- a/templates/nrpe_cfg.erb +++ b/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 %> diff --git a/templates/nrpe_cfg_head.erb b/templates/nrpe_cfg_head.erb deleted file mode 100644 index 150652f..0000000 --- a/templates/nrpe_cfg_head.erb +++ /dev/null @@ -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 diff --git a/templates/nrpe_conf.erb b/templates/nrpe_conf.erb new file mode 100644 index 0000000..e52eae8 --- /dev/null +++ b/templates/nrpe_conf.erb @@ -0,0 +1,2 @@ +# specify additional command line arguments for nrpe +NRPE_SSL_OPT="" From 09c00735a0a8080dfcde1c6c56a95f952a57dee2 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 18:41:56 +0200 Subject: [PATCH 2/2] recommit for updates in build 19 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 2 +- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nrpe.html | 2 +- .../cd_nrpe_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- .../cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 43 ++++++++++++++++--- ...d_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 16 files changed, 61 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d93b13b..985c202 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+0d8aaec9b34a306 Arne Teuke 2017-07-28 16:35:40 +

+

typo

+ +

+fa2a6a350af81c9 Jenkins Server 2017-07-28 16:35:35 +

+

recommit for updates in build 18

+ +

e39182bc9aea67b Arne Teuke 2017-07-28 16:31:53

typo

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 7bebe6c..1d1d052 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -45,7 +45,7 @@ | `-- params.pp |-- templates | |-- nrpe_cfg.erb -| `-- nrpe_cfg_head.erb +| `-- nrpe_conf.erb |-- tests | `-- UTF_Files |-- CHANGELOG.md diff --git a/doc/_index.html b/doc/_index.html index b541776..cd321e6 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -166,7 +166,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 24fa05c..2f3ea0e 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -241,7 +241,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index d38c3b9..01951f1 100644 --- a/doc/index.html +++ b/doc/index.html @@ -241,7 +241,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index 6de6b81..96c59e2 100644 --- a/doc/puppet_classes/cd_nrpe.html +++ b/doc/puppet_classes/cd_nrpe.html @@ -140,7 +140,7 @@ class cd_nrpe { diff --git a/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nrpe_3A_3Afirewall_3A_3Aiptables.html index ff119a6..679b0a3 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html index f52f3f4..098179a 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html index 8cf04c8..fb022fe 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html index aa2920d..56c35ef 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -181,7 +181,7 @@ class cd_nrpe::main::files ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html index a304032..6f20982 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html index 7941234..a173f83 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html @@ -175,7 +175,7 @@ class cd_nrpe::main::service ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html index 659fc72..2197dda 100644 --- 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 ( diff --git a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html index 0255438..2b6c232 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -650,12 +650,30 @@ config file.

—

ordering prefix for he firewall rules. Adjust -to yoru environment if +to your environment if needed.

+
  • + + ne_ssl_opts + + + (string) + + + (defaults to: '') + + + — +
    +

    Specify additional SSL options.

    +
    + +
    • +
  • ne_user @@ -802,6 +820,13 @@ needed.

    +

    See Also:

    + +
    @@ -809,8 +834,6 @@ needed.

     
 
-88
-89
 90
 91
 92
@@ -878,10 +901,15 @@ needed.
    
 154
 155
 156
-157
    +157 +158 +159 +160 +161 +162
    - 
    # File 'manifests/params.pp', line 88
+        
    # File 'manifests/params.pp', line 90
 
 class cd_nrpe::params (
 
@@ -921,6 +949,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',
@@ -960,7 +991,7 @@ $ne_nrpe_pid_file           = "${ne_run_dir}/nrpe.pid"
 
 
       
diff --git a/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html b/doc/puppet_defined_types/cd_nrpe_3A_3Acommands_3A_3Adefinitions.html
index 50e405d..8b327cb 100644
--- 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/.
    
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 1bb56d6..e968ea0 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@