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

fix set JAVA_HOME environments on FreeBSD platform

Browse Source 
FreeBSD do not use /etc/environment file for global variables. Instead we use two
places to set the variable:
  - /etc/profile for sh(1)
  - /etc/csh.login for csh(1) which is the default shell for FreeBSD

Fixes for MODULES-7819 issue
This commit is contained in:
olevole
2018-09-20 14:22:37 +03:00
parent 58669e653c
commit 728fc7e02d
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/config.pp
View File

@@ -44,7 +44,7 @@ class java::config ( ) {
}
}
}
'FreeBSD', 'Suse': {
'Suse': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/environment',
@@ -53,6 +53,20 @@ class java::config ( ) {
}
}
}
'FreeBSD': {
if $java::use_java_home != undef {
file_line { 'java-home-environment-profile':
path => '/etc/profile',
line => "JAVA_HOME=${$java::use_java_home}; export JAVA_HOME",
match => 'JAVA_HOME=',
}
file_line { 'java-home-environment-cshrc':
path => '/etc/csh.login',
line => "setenv JAVA_HOME ${$java::use_java_home}",
match => 'setenv JAVA_HOME',
}
}
}
'Solaris': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':