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

Change exec to file_line

Browse Source 
This commit updates the setting of JAVA_HOME in /etc/environment
to be done with file_line rather than exec.
This commit is contained in:
Nate Potter
2016-10-13 16:48:31 -07:00
parent 9093da3b32
commit 9df2f3d2a6
2 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
manifests/config.pp
View File

@@ -10,11 +10,10 @@ class java::config ( ) {
}
}
if $java::use_java_home != undef {
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
unless => "grep -Fx \"JAVA_HOME=${$java::use_java_home}\" \"/etc/environment\"",
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
@@ -38,51 +37,46 @@ class java::config ( ) {
}
}
if $java::use_java_home != undef {
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
unless => "grep -Fx \"JAVA_HOME=${$java::use_java_home}\" \"/etc/environment\"",
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
'OpenBSD': {
if $java::use_java_home != undef {
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
unless => "grep -Fx \"JAVA_HOME=${$java::use_java_home}\" \"/etc/environment\"",
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 {
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
unless => "grep -Fx \"JAVA_HOME=${$java::use_java_home}\" \"/etc/environment\"",
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 {
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
unless => "grep -Fx \"JAVA_HOME=${$java::use_java_home}\" \"/etc/environment\"",
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
'Solaris': {
if $java::use_java_home != undef {
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
unless => "grep -Fx \"JAVA_HOME=${$java::use_java_home}\" \"/etc/environment\"",
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}