Skip to content

Commit d3c0b32

Browse files
authored
Merge pull request #90 from treydock/splunk-service-override
Allow splunk server services to be overridden
2 parents 5aad7ef + 3fd7fc9 commit d3c0b32

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

manifests/init.pp

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
$package_source = $splunk::params::server_pkg_src,
4747
$package_name = $splunk::params::server_pkg_name,
4848
$package_ensure = $splunk::params::server_pkg_ensure,
49+
$server_service = $splunk::params::server_service,
4950
$logging_port = $splunk::params::logging_port,
5051
$splunkd_port = $splunk::params::splunkd_port,
5152
$splunk_user = $splunk::params::splunk_user,
@@ -65,7 +66,7 @@
6566
$purge_web = false,
6667
) inherits splunk::params {
6768

68-
$virtual_service = $splunk::params::server_service
69+
$virtual_service = $server_service
6970
$staging_subdir = $splunk::params::staging_subdir
7071

7172
$path_delimiter = $splunk::params::path_delimiter

manifests/platform/posix.pp

+20-14
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
class splunk::platform::posix (
1818
$splunkd_port = $splunk::splunkd_port,
1919
$splunk_user = $splunk::params::splunk_user,
20+
$server_service = $splunk::server_service,
2021
) inherits splunk::virtual {
2122

2223
include ::splunk::params
@@ -62,21 +63,26 @@
6263
# Modify virtual service definitions specific to the Linux platform. These
6364
# are virtual resources declared in the splunk::virtual class, which we
6465
# inherit.
65-
Service['splunkd'] {
66-
provider => 'base',
67-
restart => '/opt/splunk/bin/splunk restart splunkd',
68-
start => '/opt/splunk/bin/splunk start splunkd',
69-
stop => '/opt/splunk/bin/splunk stop splunkd',
70-
pattern => "splunkd -p ${splunkd_port} (restart|start)",
71-
require => Service['splunk'],
66+
if 'splunkd' in $server_service {
67+
Service['splunkd'] {
68+
provider => 'base',
69+
restart => '/opt/splunk/bin/splunk restart splunkd',
70+
start => '/opt/splunk/bin/splunk start splunkd',
71+
stop => '/opt/splunk/bin/splunk stop splunkd',
72+
pattern => "splunkd -p ${splunkd_port} (restart|start)",
73+
require => Service['splunk'],
74+
}
7275
}
73-
Service['splunkweb'] {
74-
provider => 'base',
75-
restart => '/opt/splunk/bin/splunk restart splunkweb',
76-
start => '/opt/splunk/bin/splunk start splunkweb',
77-
stop => '/opt/splunk/bin/splunk stop splunkweb',
78-
pattern => 'python -O /opt/splunk/lib/python.*/splunk/.*/root.py.*',
79-
require => Service['splunk'],
76+
if 'splunkweb' in $server_service {
77+
Service['splunkweb'] {
78+
provider => 'base',
79+
restart => '/opt/splunk/bin/splunk restart splunkweb',
80+
start => '/opt/splunk/bin/splunk start splunkweb',
81+
stop => '/opt/splunk/bin/splunk stop splunkweb',
82+
pattern => 'python -O /opt/splunk/lib/python.*/splunk/.*/root.py.*',
83+
require => Service['splunk'],
84+
}
8085
}
8186

87+
8288
}

0 commit comments

Comments
 (0)