Add $tomcat_protocol_ssl paramater for compatibility with Jira >= 7.3.

voxpupuli · Aug 16, 2017 · c6ac0f1 · c6ac0f1
1 parent 7607cec
commit c6ac0f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -120,6 +120,7 @@
   $tomcat_https_port                                                = 8443,
   Optional[Integer] $tomcat_redirect_https_port                     = undef,
   $tomcat_protocol                                                  = 'HTTP/1.1',
+  $tomcat_protocol_ssl                                              = 'org.apache.coyote.http11.Http11Protocol',
   $tomcat_use_body_encoding_for_uri                                 = true,
   $tomcat_disable_upload_timeout                                    = true,
   $tomcat_key_alias                                                 = 'jira',

diff --git a/templates/server.xml.erb b/templates/server.xml.erb
@@ -73,7 +73,7 @@
 <% if @tomcat_native_ssl -%>
         <Connector
                     port="<%= @tomcat_https_port %>"
-                    protocol="org.apache.coyote.http11.Http11Protocol"
+                    protocol="<%= @tomcat_protocol_ssl %>"
                     <%- if @tomcat_address -%>
                     address="<%= @tomcat_address %>"
                     <%- end -%>