Skip to content

Commit 9ac1e6e

Browse files
convert sysconfig java_cmd to be configurable
1 parent 7d941ab commit 9ac1e6e

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

manifests/config.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
# NOTE: this also sets JAVA_OPTS for repose 7+
5656
# Defaults to <tt>undef</tt>
5757
#
58+
# [*java_cmd*]
59+
# String. Set java command in sysconfig, if multiple java installations exist
60+
# Defaults to '/usr/bin/java'
61+
#
5862
# [*saxon_home*]
5963
# String. Home directory for Saxon. Sets SAXON_HOME
6064
# Defaults to <tt>undef</tt>
@@ -131,7 +135,7 @@
131135

132136
# default repose valve sysconfig options
133137
$repose_sysconfig = [
134-
"set JAVA_CMD '/usr/bin/java'",
138+
"set JAVA_CMD ${repose::java_cmd}",
135139
"set REPOSE_CFG '${repose::configdir}'",
136140
"set REPOSE_JAR '${repose::daemon_home}/${repose::service_name}.jar'",
137141
"set DAEMON_HOME '${repose::daemon_home}'",

manifests/init.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
Boolean $service_hasstatus,
100100
Boolean $service_hasrestart,
101101
Optional[String] $java_options = undef,
102+
String $java_cmd = '/usr/bin/java',
102103
Optional[String] $saxon_home = undef,
103104
Array $log_files = ['/var/log/repose/repose.log'],
104105
String $rotate_frequency = 'daily',

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppet-repose",
3-
"version": "3.1.1",
3+
"version": "4.0.2",
44
"author": "Josh Bell & Cory Ringdahl @ Rackspace",
55
"summary": "Puppet module for Repose",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)