Skip to content

Commit

Permalink
WIP: test against 9.2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
siegy22 committed Mar 17, 2024
1 parent 6f4cb20 commit 8e2a8f7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
14 changes: 10 additions & 4 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,13 @@ Data type: `String[1]`

The user to run Splunk as.

Default value: `$splunk::params::splunk_user`
Default value:

```puppet
versioncmp($version, '9.1.0') ? {
-1 => $splunk::params::splunk_user,
default => 'splunkfwd'
```

##### <a name="-splunk--forwarder--forwarder_homedir"></a>`forwarder_homedir`

Expand Down Expand Up @@ -1495,7 +1501,7 @@ Data type: `String[1]`
The version of Splunk to install. This will be in the form x.y.z; e.g.
"4.3.2".

Default value: `'7.2.4.2'`
Default value: `'9.2.0.1'`

##### <a name="-splunk--params--build"></a>`build`

Expand All @@ -1507,7 +1513,7 @@ automatically but a build number must be supplied in order to correctly
construct the path to the packages. A build number will be six digits;
e.g. "123586".

Default value: `'fb30470262e3'`
Default value: `'d8ae995bf219'`

##### <a name="-splunk--params--splunkd_port"></a>`splunkd_port`

Expand Down Expand Up @@ -1545,7 +1551,7 @@ Default value:
```puppet
$facts['os']['family'] ? {
'windows' => 'Administrator',
default => 'root'
default => versioncmp($version, '8.0.0') ? { -1 => 'root', default => 'splunk'
```

##### <a name="-splunk--params--src_root"></a>`src_root`
Expand Down
5 changes: 4 additions & 1 deletion manifests/forwarder.pp
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@
Boolean $manage_package_source = true,
Optional[String[1]] $package_source = undef,
Splunk::Fwdinstalloptions $install_options = $splunk::params::forwarder_install_options,
String[1] $splunk_user = $splunk::params::splunk_user,
String[1] $splunk_user = versioncmp($version, '9.1.0') ? {
-1 => $splunk::params::splunk_user,
default => 'splunkfwd'
},
Stdlib::Absolutepath $forwarder_homedir = $splunk::params::forwarder_homedir,
Stdlib::Absolutepath $forwarder_confdir = $splunk::params::forwarder_confdir,
String[1] $service_name = $splunk::params::forwarder_service,
Expand Down
6 changes: 3 additions & 3 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
# Disable certificate verification when connecting to SSL hosts to download packages.
#
class splunk::params (
String[1] $version = '7.2.4.2',
String[1] $build = 'fb30470262e3',
String[1] $version = '9.2.0.1',
String[1] $build = 'd8ae995bf219',
String[1] $src_root = 'https://download.splunk.com',
Stdlib::Port $splunkd_port = 8089,
Stdlib::Port $logging_port = 9997,
Expand All @@ -112,7 +112,7 @@
Boolean $boot_start = true,
String[1] $splunk_user = $facts['os']['family'] ? {
'windows' => 'Administrator',
default => 'root'
default => versioncmp($version, '8.0.0') ? { -1 => 'root', default => 'splunk' }
},
String[1] $default_host = $facts['clientcert'],
Boolean $manage_net_tools = true,
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/splunk_enterprise_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class { 'splunk::enterprise': }
describe file(conf_file_path) do
it { is_expected.to be_file }
it { is_expected.to be_mode 600 }
it { is_expected.to be_owned_by 'root' }
it { is_expected.to be_grouped_into 'root' }
it { is_expected.to be_owned_by 'splunk' }
it { is_expected.to be_grouped_into 'splunk' }
end
end

Expand Down

0 comments on commit 8e2a8f7

Please sign in to comment.