From d1c3d3ebd48bb6a86ae586fc4daaff9f460ca551 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Mon, 5 Dec 2016 13:58:03 +0100
Subject: [PATCH] library/roles/tomcat-multiple-instances,
 library/roles/tomcat: Define ad support the 'maxPostSize' option.

---
 .../templates/tomcat-server.xml.j2                  | 13 ++++++++-----
 tomcat/templates/tomcat-server.xml.j2               | 10 ++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tomcat-multiple-instances/templates/tomcat-server.xml.j2 b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
index 89c3053..ed1b881 100644
--- a/tomcat-multiple-instances/templates/tomcat-server.xml.j2
+++ b/tomcat-multiple-instances/templates/tomcat-server.xml.j2
@@ -52,19 +52,22 @@
 {% if item.http_enabled %}
     <!-- A http "Connector" using the shared thread pool-->
     <Connector executor="tomcatThreadPool"
-	       enableLookups="false"
+	           enableLookups="false"
                maxThreads="{{ item.max_threads }}" connectionTimeout="60000"
-	       URIEncoding="UTF-8" bindOnInit="false" address="{{ item.http_address }}"
+	           URIEncoding="UTF-8" bindOnInit="false" address="{{ item.http_address }}"
                port="{{ item.http_port }}" protocol="HTTP/1.1"
+               maxPostSize="{{ item.max_post_size | default(104857600) }}"
                redirectPort="8443" />
 {% endif %}
 
 {% if item.ajp_enabled %}
     <!-- Define an AJP 1.3 Connector on port {{ tomcat_ajp_port }} -->
     <Connector port="{{ item.ajp_port }}" protocol="AJP/1.3" redirectPort="8443"
-	       enableLookups="false" address="{{ item.ajp_address }}"
-               maxThreads="{{ item.max_threads }}" connectionTimeout="60000"
-	       URIEncoding="UTF-8" bindOnInit="false" />
+	           enableLookups="false" address="{{ item.ajp_address }}"
+               maxThreads="{{ item.max_threads }}"
+               connectionTimeout="60000"
+               maxPostSize="{{ item.max_post_size | default(104857600) }}"
+	           URIEncoding="UTF-8" bindOnInit="false" />
 {% endif %}
     
     <Engine name="Catalina" defaultHost="localhost">
diff --git a/tomcat/templates/tomcat-server.xml.j2 b/tomcat/templates/tomcat-server.xml.j2
index deb0673..ce5556e 100644
--- a/tomcat/templates/tomcat-server.xml.j2
+++ b/tomcat/templates/tomcat-server.xml.j2
@@ -76,10 +76,11 @@
 {% if tomcat_http_enabled %}
     <!-- A http "Connector" using the shared thread pool-->
     <Connector executor="tomcatThreadPool"
-	       enableLookups="false" maxPostSize="{{ tomcat_max_post_size }}"
+	           enableLookups="false" maxPostSize="{{ tomcat_max_post_size }}"
                maxThreads="{{ tomcat_max_threads }}" connectionTimeout="60000"
-	       URIEncoding="UTF-8" bindOnInit="false" address="{{ tomcat_http_address }}"
+	           URIEncoding="UTF-8" bindOnInit="false" address="{{ tomcat_http_address }}"
                port="{{ tomcat_http_port }}" protocol="HTTP/1.1"
+               maxPostSize="{{ tomcat_max_post_size | default(104857600) }}"
                redirectPort="8443" />
 
     <!-- Define a SSL HTTP/1.1 Connector on port 8443
@@ -95,9 +96,10 @@
 {% if tomcat_ajp_enabled %}
     <!-- Define an AJP 1.3 Connector on port {{ tomcat_ajp_port }} -->
     <Connector port="{{ tomcat_ajp_port }}" protocol="AJP/1.3" redirectPort="8443"
-	       enableLookups="false" address="{{ tomcat_ajp_address }}" maxPostSize="{{ tomcat_max_post_size }}"
+	           enableLookups="false" address="{{ tomcat_ajp_address }}" maxPostSize="{{ tomcat_max_post_size }}"
                maxThreads="{{ tomcat_max_threads }}" connectionTimeout="60000"
-	       URIEncoding="UTF-8" bindOnInit="false" />
+               maxPostSize="{{ tomcat_max_post_size | default(104857600) }}"
+	           URIEncoding="UTF-8" bindOnInit="false" />
 {% endif %}
     
     <!-- An Engine represents the entry point (within Catalina) that processes