From 84b5e09383fa0e2f77cd0022457e6f10b0a26099 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 28 Jul 2017 18:49:08 +0100 Subject: [PATCH 1/2] updated template --- templates/nrpe_cfg.erb | 63 ++++++------------------------------------ 1 file changed, 8 insertions(+), 55 deletions(-) diff --git a/templates/nrpe_cfg.erb b/templates/nrpe_cfg.erb index fc48bfe..6198bb9 100644 --- a/templates/nrpe_cfg.erb +++ b/templates/nrpe_cfg.erb @@ -37,65 +37,18 @@ 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/TLS OPTIONS -# These directives allow you to specify how to use SSL/TLS. +#ssl_cacert_file=<%= @ne_ssl_cacert_file %> +#ssl_cert_file=<%= @ne_ssl_cert_file %> +#ssl_privatekey_file=<%= @ne_ssl_privatekey_file %> -# SSL VERSION -# This can be any of: SSLv2 (only use SSLv2), SSLv2+ (use any version), -# SSLv3 (only use SSLv3), SSLv3+ (use SSLv3 or above), TLSv1 (only use -# TLSv1), TLSv1+ (use TLSv1 or above), TLSv1.1 (only use TLSv1.1), -# TLSv1.1+ (use TLSv1.1 or above), TLSv1.2 (only use TLSv1.2), -# TLSv1.2+ (use TLSv1.2 or above) -# If an "or above" version is used, the best will be negotiated. So if both -# ends are able to do TLSv1.2 and use specify SSLv2, you will get TLSv1.2. -# If you are using openssl 1.1.0 or above, the SSLv2 options are not available. +#ssl_client_certs=<%= @ne_ssl_client_certs %> +#ssl_logging=<%= @ne_ssl_logging %> -#ssl_version=SSLv2+ -# SSL USE ADH -# This is for backward compatibility and is DEPRECATED. Set to 1 to enable -# ADH or 2 to require ADH. 1 is currently the default but will be changed -# in a later version. - -#ssl_use_adh=1 - -# SSL CIPHER LIST -# This lists which ciphers can be used. For backward compatibility, this -# defaults to 'ssl_cipher_list=ALL:!MD5:@STRENGTH' in this version but -# will be changed to something like the example below in a later version of NRPE. - -#ssl_cipher_list=ALL:!MD5:@STRENGTH -#ssl_cipher_list=ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH - -# SSL Certificate and Private Key Files - -#ssl_cacert_file=/etc/ssl/servercerts/ca-cert.pem -#ssl_cert_file=/etc/ssl/servercerts/nagios-cert.pem -#ssl_privatekey_file=/etc/ssl/servercerts/nagios-key.pem - -# SSL USE CLIENT CERTS -# This options determines client certificate usage. -# Values: 0 = Don't ask for or require client certificates (default) -# 1 = Ask for client certificates -# 2 = Require client certificates - -#ssl_client_certs=0 - -# SSL LOGGING -# This option determines which SSL messages are send to syslog. OR values -# together to specify multiple options. - -# Values: 0x00 (0) = No additional logging (default) -# 0x01 (1) = Log startup SSL/TLS parameters -# 0x02 (2) = Log remote IP address -# 0x04 (4) = Log SSL/TLS version of connections -# 0x08 (8) = Log which cipher is being used for the connection -# 0x10 (16) = Log if client has a certificate -# 0x20 (32) = Log details of client's certificate if it has one -# -1 or 0xff or 0x2f = All of the above - -#ssl_logging=0x00 # NASTY METACHARACTERS From 7e385567bfbfacf4567c44a217290b693e87a7c5 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 19:49:00 +0200 Subject: [PATCH 2/2] recommit for updates in build 34 --- CHANGELOG.md | 10 ++++++++++ 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 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aconfig.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Adirs.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Ainstall.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Aservice.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nrpe_3A_3Aparams.html | 2 +- .../cd_nrpe_3A_3Acommands_3A_3Adefinitions.html | 2 +- doc/top-level-namespace.html | 2 +- 15 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2950dc..1bcc6ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+967d659146b79e6 Jenkins Server 2017-07-28 17:44:09 +

+

recommit for updates in build 33

+ +

+60d516c21e0387b Arne Teuke 2017-07-28 17:44:04 +

+

updated template

+ +

20764ea939762ca Arne Teuke 2017-07-28 17:42:06

updated template

diff --git a/doc/_index.html b/doc/_index.html index 8fb0a89..d785916 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 e5d5348..dc13a3f 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -252,7 +252,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 210bf7f..52a30c1 100644 --- a/doc/index.html +++ b/doc/index.html @@ -252,7 +252,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nrpe.html b/doc/puppet_classes/cd_nrpe.html index c8bf69e..0147acb 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 cb83dde..b4dffe7 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 7bbf90a..25068ee 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 4825f71..5b4389f 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 d75fdd5..2ecfe46 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Amain_3A_3Afiles.html @@ -217,7 +217,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 90d18b0..1215140 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 0b5de8c..5e37caf 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 4774719..cbb8112 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 22c6532..80f44c6 100644 --- a/doc/puppet_classes/cd_nrpe_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nrpe_3A_3Aparams.html @@ -1007,7 +1007,7 @@ $ne_nrpe_conf_erb = 'cd_nrpe/nrpe_conf.erb' 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 3be3dda..272b296 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 f026e63..061f983 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@