Skip to content
Snippets Groups Projects
Commit 12716fc3 authored by Marco Malavolti's avatar Marco Malavolti
Browse files

Removed the piece of code that insert lines into /etc/environment file for...

Removed the piece of code that insert lines into /etc/environment file for Java because the variable JAVA_HOME and JAVA_OPTS must be configured on /etc/default/tomcatX directory
parent 1cccc005
No related branches found
No related tags found
No related merge requests found
...@@ -24,18 +24,4 @@ class shib2common::java::download { ...@@ -24,18 +24,4 @@ class shib2common::java::download {
# require => Package["oracle-java7-installer", "oracle-jdk7-installer"], # require => Package["oracle-java7-installer", "oracle-jdk7-installer"],
#} #}
file_line {
'java_environment_rule_1':
ensure => present,
path => '/etc/environment',
line => "JAVA_HOME=${::shib2idp::java::params::java_home}",
require => Download_file[$::shib2idp::java::params::java_home];
'java_environment_rule_2':
ensure => present,
path => '/etc/environment',
line => 'JAVA_OPTS="-Djava.awt.headless=true -Xmx512M -XX:MaxPermSize=128m"',
require => Download_file[$::shib2idp::java::params::java_home];
}
} }
...@@ -62,18 +62,4 @@ class shib2common::java::package { ...@@ -62,18 +62,4 @@ class shib2common::java::package {
$java_dir_name = 'java-7-oracle' $java_dir_name = 'java-7-oracle'
$java_home = "/usr/lib/jvm/${shib2common::java::params::java_dir_name}" $java_home = "/usr/lib/jvm/${shib2common::java::params::java_dir_name}"
file_line {
'java_environment_rule_1':
ensure => present,
path => '/etc/environment',
line => "JAVA_HOME=${java_home}",
require => [Package['oracle-java7-installer'], Package['oracle-jdk7-installer']];
'java_environment_rule_2':
ensure => present,
path => '/etc/environment',
line => 'JAVA_OPTS="-Djava.awt.headless=true -Xmx512M -XX:MaxPermSize=128m"',
require => [Package['oracle-java7-installer'], Package['oracle-jdk7-installer']];
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment