From 7dc249bece7e0ea144eabfb331376df50fb4120d Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Thu, 23 Mar 2017 17:32:43 +0100
Subject: [PATCH] library/roles/tomcat-multiple-instances: Manage context.xml,
 for JNDI

---
 tomcat-multiple-instances/defaults/main.yml   |  1 +
 tomcat-multiple-instances/tasks/main.yml      |  9 ++++
 .../templates/tomcat-context.xml.j2           | 54 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 tomcat-multiple-instances/templates/tomcat-context.xml.j2

diff --git a/tomcat-multiple-instances/defaults/main.yml b/tomcat-multiple-instances/defaults/main.yml
index 8dac1fa..09a10e0 100644
--- a/tomcat-multiple-instances/defaults/main.yml
+++ b/tomcat-multiple-instances/defaults/main.yml
@@ -36,6 +36,7 @@ tomcat_m_webapps_autodeploy: False
 tomcat_m_webapps_unpack: False
 tomcat_m_start_instances: True
 tomcat_m_enable_instances: True
+tomcat_m_jndi_pool: False
 
 # JMX and debugging
 tomcat_m_enable_remote_debugging: False
diff --git a/tomcat-multiple-instances/tasks/main.yml b/tomcat-multiple-instances/tasks/main.yml
index c8412cd..b456e9e 100644
--- a/tomcat-multiple-instances/tasks/main.yml
+++ b/tomcat-multiple-instances/tasks/main.yml
@@ -111,8 +111,17 @@
   register: restart_needed
   notify:
     - tomcat restart instances with changed configs 
+  when: tomcat_m_jndi_pool
   tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf', 'tomcat_default' ]
 
+- name: Install a custom context.xml file
+  template: src=tomcat-context.xml.j2 dest={{ item.instance_path }}/conf/context.xml owner={{ item.user }} group={{ item.user }} mode=0640
+  with_items: '{{ tomcat_m_instances }}'
+  register: restart_needed
+  notify:
+    - tomcat restart instances with changed configs 
+  tags: [ 'tomcat', 'tomcat_instances', 'tomcat_conf', 'tomcat_contextxml' ]
+
 - name: Install a logrotate entry for the access log file
   template: src=tomcat.logrotate.j2 dest=/etc/logrotate.d/tomcat_instance-{{ item.http_port }} owner=root group=root mode=0644
   with_items: '{{ tomcat_m_instances }}'
diff --git a/tomcat-multiple-instances/templates/tomcat-context.xml.j2 b/tomcat-multiple-instances/templates/tomcat-context.xml.j2
new file mode 100644
index 0000000..b2cd9e5
--- /dev/null
+++ b/tomcat-multiple-instances/templates/tomcat-context.xml.j2
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context>
+
+    <!-- Default set of monitored resources -->
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+
+    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+    <!--
+    <Manager pathname="" />
+    -->
+
+    <!-- Uncomment this to enable Comet connection tacking (provides events
+         on session expiration as well as webapp lifecycle) -->
+    <!--
+    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
+    -->
+{% if tomcat_m_jndi_pool %}
+    <Resource name="jdbc/postgres"
+              auth="Container"
+              type="javax.sql.DataSource"
+              driverClassName="org.postgresql.Driver"
+              url="jdbc:postgresql://{{ tomcat_jndi_pool_host }}:{{ tomcat_jndi_pool_db_port | default (5432) }}/{{ tomcat_jndi_pool_db }}"
+              username="{{ tomcat_jndi_pool_db_user }}" password="{{ tomcat_jndi_pool_db_pwd }}"
+              maxActive="20"
+              initialSize="0"
+              minIdle="0"
+              maxIdle="8"
+              maxWait="10000"
+              timeBetweenEvictionRunsMillis="30000"
+              minEvictableIdleTimeMillis="60000"
+              testWhileIdle="true"
+              validationQuery="SELECT 1"
+              maxAge="600000"
+              rollbackOnReturn="true"
+{% endif %}
+      />
+</Context>