Skip to content
Snippets Groups Projects
Commit 655c7417 authored by Andrea Biancini's avatar Andrea Biancini
Browse files

Added precedence java->tomcat

parent 4a08bbc7
No related branches found
No related tags found
No related merge requests found
...@@ -13,10 +13,12 @@ class tomcat::tomcat7 { ...@@ -13,10 +13,12 @@ class tomcat::tomcat7 {
package { package {
["liblog4j1.2-java", "libcommons-logging-java", "libtomcat7-java"]: ["liblog4j1.2-java", "libcommons-logging-java", "libtomcat7-java"]:
ensure => present; ensure => present,
require => Class['shib2common::java::package'];
["tomcat7-common", "tomcat7"]: ["tomcat7-common", "tomcat7"]:
ensure => present; ensure => present,
require => Class['shib2common::java::package'];
} }
...@@ -30,6 +32,17 @@ class tomcat::tomcat7 { ...@@ -30,6 +32,17 @@ class tomcat::tomcat7 {
$catalina_out = '/var/log/tomcat7/catalina.out' $catalina_out = '/var/log/tomcat7/catalina.out'
$catalina_home = '/var/lib/tomcat7' $catalina_home = '/var/lib/tomcat7'
# Default JVM options
file {"${tomcat_home}/bin/setenv.sh":
content => join(['export JAVA_HOME="/usr/lib/jvm/java-7-oracle"',
'export JAVA_ENDORSED_DIRS="/usr/share/tomcat7/endorsed"'], "\n"),
owner => "root",
group => "root",
mode => 755,
require => Package["tomcat7"],
before => Service["tomcat7"],
}
file { "log4j.properties": file { "log4j.properties":
path => "${catalina_home}/conf/log4j.properties", path => "${catalina_home}/conf/log4j.properties",
source => $::log4j_conffile ? { source => $::log4j_conffile ? {
......
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