AZURE-211 SQL Server support for Azure Quick Start

roles/crowd_config/tasks/main.yml

@@ -51,7 +51,7 @@
   lineinfile:
     path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh"
     insertafter: "EOF"
-    line: "export JAVA_HOME={{ java_home | default('/usr/lib/jvm/jre-{{ java_version }}-openjdk')}}"
+    line: "export JAVA_HOME={{ java_home | default('/usr/lib/jvm/jre-{{ java_version }}-openjdk') }}"
 
 - name: Create application directories
   file:
@@ -139,8 +139,8 @@
     xpath: "/application-configuration/properties/property[@name='hibernate.connection.url']"
     value: "{{ atl_jdbc_url }}?reWriteBatchedInserts=true"
   when: crowd_cfg_stat_result.stat.exists
-  
+
 - name: Remove crowd.xml to prevent duplicates from appearing in cluster reporting
   file:
     path: "{{ atl_product_installation_versioned }}/apache-tomcat/conf/Catalina/localhost/crowd.xml"
-    state: absent
+    state: absent

roles/crowd_config/templates/server.xml.j2

@@ -4,10 +4,6 @@
         shutdown="SHUTDOWN">
 
     <Service name="Catalina">
-<!-- Add the SSL properties when the load balancer is configured
-                   secure="{{ atl_tomcat_secure }}"
-                scheme="{{ atl_tomcat_scheme }}"
- -->
         <Connector acceptCount="{{ atl_tomcat_acceptcount }}"
                    connectionTimeout="{{ atl_tomcat_connectiontimeout }}"
                    disableUploadTimeout="true"
@@ -22,8 +18,14 @@
                    compression="on"
                    sendReasonPhrase="true"
                    compressableMimeType="text/html,text/xml,application/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript"
-                   proxyName="{{ atl_proxy_name }}"
-                   proxyPort="{{ atl_proxy_port }}"
+                   secure="{{ atl_tomcat_secure }}"
+                   scheme="{{ atl_tomcat_scheme }}"
+                   {% if atl_proxy_name is defined and atl_proxy_name != '' %}
+                    proxyName="{{ atl_proxy_name }}"
+                   {% endif %}
+                   {% if atl_proxy_port is defined and atl_proxy_port != '' %}
+                    proxyPort="{{ atl_proxy_port }}"
+                   {% endif %}
                    protocol="{{ atl_tomcat_protocol }}">
         </Connector>
 
@@ -50,6 +52,7 @@
                        redirectPort="{{ atl_tomcat_redirectport }}"
                        protocol=""AJP/1.3"" />
         -->
+        {% if atl_tomcat_redirectport is defined and atl_tomcat_redirectport != '' %}
         <Connector port="{{ atl_tomcat_redirectport }}"
                    protocol="{{ atl_tomcat_protocol }}"
                    relaxedPathChars="[]|"
@@ -61,6 +64,7 @@
                    compression="on"
                    compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript">
         </Connector>
+        {% endif %}
     </Service>
 
     <!-- Security listener. Documentation at /docs/config/listeners.html