Commit e530752c authored by Vasco Grossmann's avatar Vasco Grossmann

java and tomcat versions moved from 7 to 6

parent 17c63b53
tomcat7:
tomcat6:
pkg:
- installed
service:
- running
- require:
- pkg: tomcat7
- pkg: tomcat6
{% for id in range(9) %}
{% for id in range(10) %}
group{{id+1}}:
group.present:
- addusers:
- tomcat7
- tomcat6
user:
- present
- shell: /bin/bash
......@@ -18,11 +18,11 @@ group{{id+1}}:
- require:
- user: group{{id+1}}
/var/lib/tomcat7/conf/Catalina/localhost/group{{id+1}}.xml:
/var/lib/tomcat6/conf/Catalina/localhost/group{{id+1}}.xml:
cmd.run:
- name: echo "<Context docBase=\"/home/group{{id+1}}/BabsiWeb.war\" unpackWAR=\"true\" path=\"/group{{id+1}}\" reloadable=\"true\" />" > /var/lib/tomcat7/conf/Catalina/localhost/group{{id+1}}.xml
- name: echo "<Context docBase=\"/home/group{{id+1}}/BabsiWeb.war\" unpackWAR=\"true\" path=\"/group{{id+1}}\" reloadable=\"true\" />" > /var/lib/tomcat6/conf/Catalina/localhost/group{{id+1}}.xml
usermod -a -G group{{id+1}} tomcat7:
usermod -a -G group{{id+1}} tomcat6:
cmd.run
{% endfor %}
openjdk-7-jdk:
openjdk-6-jdk:
pkg.installed
/etc/profile.d/java.sh:
......@@ -7,5 +7,5 @@ openjdk-7-jdk:
set_java_home:
file.append:
- name: /etc/profile.d/java.sh
- text: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
- text: export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64
- onlyif: test /etc/profile.d/java.sh
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment