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

Change file resource to exec

Browse Source 
This commit changes the way the JAVA_HOME variable is added to
/etc/environment from using a file resource to using an exec
resource. This way we can avoid resource conflicts with the
file.

Signed-off-by: Nate Potter <ntpttr@gmail.com>
This commit is contained in:
Nate Potter
2016-09-17 11:00:26 -07:00
parent dd8f85a2fa
commit eb587a433e
2 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/config.pp
View File

@@ -10,8 +10,10 @@ class java::config ( ) {
}
}
if $java::use_java_home != undef {
file { '/etc/environment':
content => inline_template("JAVA_HOME=${$java::use_java_home}"),
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
}
}
}
@@ -35,36 +37,46 @@ class java::config ( ) {
}
}
if $java::use_java_home != undef {
file { '/etc/environment':
content => inline_template("JAVA_HOME=${$java::use_java_home}"),
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
}
}
}
'OpenBSD': {
if $java::use_java_home != undef {
file { '/etc/environment':
content => inline_template("JAVA_HOME=${$java::use_java_home}"),
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
}
}
}
'FreeBSD': {
if $java::use_java_home != undef {
file { '/etc/environment':
content => inline_template("JAVA_HOME=${$java::use_java_home}"),
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
}
}
}
'Suse': {
if $java::use_java_home != undef {
file { '/etc/environment':
content => inline_template("JAVA_HOME=${$java::use_java_home}"),
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
}
}
}
'Solaris': {
if $java::use_java_home != undef {
file { '/etc/environment':
content => inline_template("JAVA_HOME=${$java::use_java_home}"),
exec { 'java-home-environment':
path => '/bin',
user => 'root',
command => "echo JAVA_HOME=${$java::use_java_home} >> /etc/environment",
}
}
}