RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge pull request #205 from eputnam/MODULES-4081

Browse Source 
(MODULES-4081) uses /etc/profile for solaris
This commit is contained in:
David Schmitt
2016-11-23 19:23:09 +00:00
committed by GitHub
parent d27b0af5a9 efb9823d3c
commit 08ace70cb3
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/config.pp
View File

@@ -44,25 +44,7 @@ class java::config ( ) {
} }
} }
} }
'OpenBSD': { 'OpenBSD', 'FreeBSD', 'Suse': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
'FreeBSD': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
'Suse': {
if $java::use_java_home != undef { if $java::use_java_home != undef {
file_line { 'java-home-environment': file_line { 'java-home-environment':
path => '/etc/environment', path => '/etc/environment',
@@ -74,7 +56,7 @@ class java::config ( ) {
'Solaris': { 'Solaris': {
if $java::use_java_home != undef { if $java::use_java_home != undef {
file_line { 'java-home-environment': file_line { 'java-home-environment':
path => '/etc/environment', path => '/etc/profile',
line => "JAVA_HOME=${$java::use_java_home}", line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=', match => 'JAVA_HOME=',
} }