diff --git a/manifests/main/files.pp b/manifests/main/files.pp index 82696c6..629f362 100644 --- a/manifests/main/files.pp +++ b/manifests/main/files.pp @@ -74,9 +74,9 @@ class confdroid_nrpe::main::files ( file { $ne_ssl_cert_file: ensure => file, path => $ne_ssl_cert_file, - owner => 'root', - group => 'root', - mode => '0644', + owner => $ne_user, + group => $ne_user, + mode => '0440', selrange => s0, selrole => object_r, seltype => cert_t, @@ -86,9 +86,9 @@ class confdroid_nrpe::main::files ( file { $ne_ssl_privatekey_file: ensure => file, path => $ne_ssl_privatekey_file, - owner => 'root', - group => 'root', - mode => '0600', + owner => $ne_user, + group => $ne_user, + mode => '0400', selrange => s0, selrole => object_r, seltype => cert_t, @@ -98,9 +98,9 @@ class confdroid_nrpe::main::files ( file { $ne_ssl_ca_cert_file: ensure => file, path => $ne_ssl_ca_cert_file, - owner => 'root', - group => 'root', - mode => '0644', + owner => $ne_user, + group => $ne_user, + mode => '0440', selrange => s0, selrole => object_r, seltype => cert_t, diff --git a/manifests/params.pp b/manifests/params.pp index 40a6bb5..7d16569 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -30,8 +30,6 @@ # daemon will allow plugins to finish executing before killing them off. # @param [String] ne_connection_timeout maximum number of seconds that the # NRPE daemon will wait for a connection to be established before exiting. -# @param [String] ne_ssl_version These directives allow you to specify how to -# use SSL/TLS. # @param [String] ne_ssl_cipher_list ciphers can be used. For backward # compatibility, this defaults to 'ssl_cipher_list=ALL:!MD5:@STRENGTH' in # this version but will be changed in a later version of NRPE. @@ -111,7 +109,6 @@ class confdroid_nrpe::params ( String $ne_connection_timeout = '300', String $ne_allow_weak_rnd_seed = '1', Boolean $ne_enable_ssl = false, - String $ne_ssl_version = 'TLSv2+', String $ne_ssl_cipher_list = 'ALL:!aNULL:!eNULL:!SSLv2:!LOW:!EXP:!RC4:!MD5:@STRENGTH', String $ne_ssl_client_certs = '0', String $ne_ssl_logging = '0x00', diff --git a/templates/nrpe_cfg.erb b/templates/nrpe_cfg.erb index e3984e2..898fc98 100644 --- a/templates/nrpe_cfg.erb +++ b/templates/nrpe_cfg.erb @@ -34,7 +34,6 @@ connection_timeout=<%= @ne_connection_timeout %> allow_weak_random_seed=<%= @ne_allow_weak_rnd_seed %> <% if @ne_enable_ssl == true -%> -ssl_version=<%= @ne_ssl_version %> ssl_cipher_list=<%= @ne_ssl_cipher_list %> ssl_cacert_file=<%= @ne_ssl_ca_cert_file %> ssl_cert_file=<%= @ne_ssl_cert_file %>