From 4b04854a88ec042f97ed2ef5845596743d07298d Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 19 Feb 2020 15:01:44 +0000 Subject: [PATCH 1/3] adding config option for https --- manifests/enterprise.pp | 1 + manifests/enterprise/config.pp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/manifests/enterprise.pp b/manifests/enterprise.pp index fcd23dda..ec0e130c 100644 --- a/manifests/enterprise.pp +++ b/manifests/enterprise.pp @@ -192,6 +192,7 @@ Stdlib::Port $splunkd_port = $splunk::params::splunkd_port, Stdlib::Port $logging_port = $splunk::params::logging_port, Stdlib::Port $web_httpport = 8000, + Stdlib::Port $web_ssl = 0, Boolean $purge_alert_actions = false, Boolean $purge_authentication = false, Boolean $purge_authorize = false, diff --git a/manifests/enterprise/config.pp b/manifests/enterprise/config.pp index c6a9f50f..61215457 100644 --- a/manifests/enterprise/config.pp +++ b/manifests/enterprise/config.pp @@ -96,6 +96,12 @@ value => $splunk::enterprise::web_httpport, tag => 'splunk_server', } + splunk_web { 'splunk_server_web_ssl': + section => 'settings', + setting => 'enableSplunkWebSSL', + value => $splunk::enterprise::web_ssl, + tag => 'splunk_server', + } } File <| tag == 'splunk_enterprise' |> -> Splunk_alert_actions<||> ~> Class['splunk::enterprise::service'] From 692490a6ef25802cb6a040a1baba1aea533a8985 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 19 May 2020 17:28:33 +0100 Subject: [PATCH 2/3] we have to use fact splunkforwarder_version for the forwarders --- manifests/forwarder/password/seed.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/forwarder/password/seed.pp b/manifests/forwarder/password/seed.pp index 1aea8cc3..e41bd6c7 100644 --- a/manifests/forwarder/password/seed.pp +++ b/manifests/forwarder/password/seed.pp @@ -57,7 +57,7 @@ content => $secret, } - if $reset_seeded_password or $facts['splunk_version'].empty { + if $reset_seeded_password or $facts['splunkforwarder_version'].empty { file { $password_config_file: ensure => absent, before => File[$seed_config_file], From ebbcbeb3661bda98f6d3462ad1103d955b4edb78 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 20 May 2020 08:35:37 +0100 Subject: [PATCH 3/3] This commit is not related to the other change, going to submit in a separate pull request Revert "we have to use fact splunkforwarder_version for the forwarders" This reverts commit 692490a6ef25802cb6a040a1baba1aea533a8985. --- manifests/forwarder/password/seed.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/forwarder/password/seed.pp b/manifests/forwarder/password/seed.pp index e41bd6c7..1aea8cc3 100644 --- a/manifests/forwarder/password/seed.pp +++ b/manifests/forwarder/password/seed.pp @@ -57,7 +57,7 @@ content => $secret, } - if $reset_seeded_password or $facts['splunkforwarder_version'].empty { + if $reset_seeded_password or $facts['splunk_version'].empty { file { $password_config_file: ensure => absent, before => File[$seed_config_file],