AZURE-211 Determine Java Home for an Ubuntu Crowd deployment

roles/crowd_config/tasks/main.yml

@@ -47,11 +47,12 @@
     insertbefore: "^export CATALINA_OPTS$"
     marker: "# {mark} ANSIBLE MANAGED CATALINA_OPTS"
 
+# Crowd uses the system jdk installed (atl_use_system_jdk == true) rather than a packaged JDK
 - name: Set JAVA_HOME
   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={{ system_java_home }}"
 
 - name: Create application directories
   file:
@@ -114,6 +115,7 @@
     positional_args:
       - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}/crowd"
   when:
+    - atl_db_engine == "postgres"
     - atl_proxy_name is defined
     - atl_tomcat_scheme is defined
     - db_created is undefined or not db_created.changed

roles/crowd_config/templates/server.xml.j2

@@ -20,12 +20,12 @@
                    compressableMimeType="text/html,text/xml,application/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript"
                    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 %}
+{% 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>