From 1d32249849f577face2a8996956ddaa10bc083b8 Mon Sep 17 00:00:00 2001
From: William Lieurance <wlieurance@backstopsolutions.com>
Date: Wed, 21 Jan 2015 13:37:28 -0600
Subject: [PATCH] Turn on the AJP connector based on a hiera or puppet-variable
 lookup

---
 jira.yaml                |  8 ++++++++
 manifests/init.pp        |  2 ++
 templates/server.xml.erb | 12 ++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/jira.yaml b/jira.yaml
index 82746c01..f69775a8 100644
--- a/jira.yaml
+++ b/jira.yaml
@@ -100,5 +100,13 @@ jira::proxy:
   scheme:    'https'
   proxyName: 'www.exmaple.co.za'
   proxyPort: '443'
+# Configure AJP port
+jira::ajp: 
+  port:         '8009'
+  redirectPort: '8443'
+  protocol:     'AJP/1.3'
+
+# Optionally, configure AJP parameters the same way you do jira::proxy above
+
 # Configure path attribute for the <Context>
 jira::contextpath: '/jira'
diff --git a/manifests/init.pp b/manifests/init.pp
index 21bb23cb..a360c074 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -111,6 +111,8 @@
   
   # Reverse https proxy
   $proxy = {},
+  # Options for the AJP connector
+  $ajp   = {},
   # Context path (usualy used in combination with a reverse proxy)
   $contextpath = '',
 
diff --git a/templates/server.xml.erb b/templates/server.xml.erb
index 0a1d650e..8592d4e4 100644
--- a/templates/server.xml.erb
+++ b/templates/server.xml.erb
@@ -112,10 +112,14 @@
          ====================================================================================
         -->
 
-        <!--
-              <Connector port="8009" redirectPort="8443" enableLookups="false" protocol="AJP/1.3" URIEncoding="UTF-8"/>
-        -->
-
+<% if @ajp -%>
+   <Connector enableLookups="false" URIEncoding="UTF-8"
+<%   @ajp.sort.each do |key,value| -%>
+ <%= key %> = <%= "\'#{value}\'" %>
+<%   end -%>
+<% end -%>
+/>
+  
         <Engine name="Catalina" defaultHost="localhost">
             <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">