From 4e8016f2767c8131162de0b4ddf3a59892713fcc Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 17 Feb 2021 17:51:22 +0000
Subject: [PATCH] fix: resolve configuration and tests for Ubuntu 16.04

---
 .../default/files/_mapdata/ubuntu-16.yaml     | 26 ++++++------
 .../default/files/server_xml/ubuntu-16.xml    | 42 +++++++++----------
 tomcat/osfingermap.yaml                       |  5 ++-
 3 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
index d743573c..8d3cc452 100644
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -4,14 +4,14 @@
 values:
   arch: amd64
   authbind: 'no'
-  catalina_base: /var/lib/tomcat9
-  catalina_home: /usr/share/tomcat9
-  catalina_pid: /var/run/tomcat.pid
-  catalina_tmpdir: /var/cache/tomcat/temp
+  catalina_base: /var/lib/tomcat8
+  catalina_home: /usr/share/tomcat8
+  catalina_pid: /var/run/tomcat8.pid
+  catalina_tmpdir: /var/cache/tomcat8/temp
   cluster:
     simple: true
-  common_pkg: tomcat9-common
-  conf_dir: /etc/tomcat9
+  common_pkg: tomcat8-common
+  conf_dir: /etc/tomcat8
   connectors:
     example_connector:
       SSLEnabled: 'false'
@@ -68,7 +68,7 @@ values:
         name: linkToGlobalResource
         type: java.lang.Integer
   expires_when: 2 weeks
-  group: tomcat
+  group: tomcat8
   haveged_enabled: true
   id:
   - example.com
@@ -87,7 +87,7 @@ values:
     soft: 64000
   logfile_compress: 1
   logfile_days: 14
-  main_config: /etc/default/tomcat9
+  main_config: /etc/default/tomcat8
   main_config_template: salt://tomcat/files/tomcat-default-Debian.template
   manager:
     roles:
@@ -106,7 +106,7 @@ values:
         - manager-script
         - manager-jmx
         - manager-status
-  manager_pkg: tomcat9-admin
+  manager_pkg: tomcat8-admin
   native_pkg: libtcnative-1
   other_contexts:
     other-contexts:
@@ -133,10 +133,10 @@ values:
         debug: 1
         docBase: /path/to/webapp
         reloadable: 'true'
-  pkg: tomcat9
+  pkg: tomcat8
   resources: {}
   security: 'no'
-  service: tomcat9
+  service: tomcat8
   service_enabled: true
   service_running: false
   sites:
@@ -171,6 +171,6 @@ values:
         prefix: localhost_access_log.
         suffix: .log
       - className: org.apache.catalina.authenticator.SingleSignOn
-  user: tomcat
-  ver: 9
+  user: tomcat8
+  ver: 8
   with_haveged: true
diff --git a/test/integration/default/files/server_xml/ubuntu-16.xml b/test/integration/default/files/server_xml/ubuntu-16.xml
index 93757aec..1d15ad39 100644
--- a/test/integration/default/files/server_xml/ubuntu-16.xml
+++ b/test/integration/default/files/server_xml/ubuntu-16.xml
@@ -69,24 +69,24 @@
   <Service name="Catalina">
     <Connector
     
-               port="8443"
-               protocol="org.apache.coyote.http11.Http11Protocol"
-               connectionTimeout="20000"
-               URIEncoding="UTF-8"
-               redirectPort="8443"
                maxHttpHeaderSize="8192"
-               maxThreads="150"
-               minSpareThreads="25"
-               enableLookups="false"
-               disableUploadTimeout="true"
+               connectionTimeout="20000"
+               SSLEnabled="false"
                acceptCount="100"
+               keystoreFile="/path/to/keystoreFile"
+               disableUploadTimeout="true"
                scheme="https"
                secure="true"
                clientAuth="false"
-               sslProtocol="TLS"
-               SSLEnabled="false"
-               keystoreFile="/path/to/keystoreFile"
+               URIEncoding="UTF-8"
                keystorePass="somerandomtext"
+               enableLookups="false"
+               sslProtocol="TLS"
+               redirectPort="8443"
+               minSpareThreads="25"
+               maxThreads="150"
+               port="8443"
+               protocol="org.apache.coyote.http11.Http11Protocol"
     />
     
     
@@ -106,9 +106,9 @@
       
       
       <Host name="tomcat-server"
-            unpackWARs="true"
             autoDeploy="true"
-            deployXML="false">
+            deployXML="false"
+            unpackWARs="true">
             <Context path=""
                      docBase="../webapps/myapp"
                      debug="0"
@@ -120,8 +120,8 @@
       </Host>
       
       <Host name="example.net"
-            unpackWARs="true"
-            autoDeploy="true">
+            autoDeploy="true"
+            unpackWARs="true">
             <Context path=""
                      docBase="../webapps/myapp2"
                      debug="0"
@@ -131,12 +131,12 @@
             <Alias>www.example.net</Alias>
             
               <Valve
-                className="org.apache.catalina.valves.AccessLogValve"
-                directory="logs"
-                prefix="localhost_access_log."
-                fileDateFormat="yyyy-MM-dd-HH"
+                pattern="%h %l %u %t &quot;%m http://%v%U %H&quot; %s %b &quot;%{Referer}i&quot; &quot;%{User-Agent}i&quot; %D"
                 suffix=".log"
-                pattern="%h %l %u %t &quot;%m http://%v%U %H&quot; %s %b &quot;%{Referer}i&quot; &quot;%{User-Agent}i&quot; %D" />
+                fileDateFormat="yyyy-MM-dd-HH"
+                directory="logs"
+                className="org.apache.catalina.valves.AccessLogValve"
+                prefix="localhost_access_log." />
               <Valve
                 className="org.apache.catalina.authenticator.SingleSignOn" />
             
diff --git a/tomcat/osfingermap.yaml b/tomcat/osfingermap.yaml
index 22794131..e779da68 100644
--- a/tomcat/osfingermap.yaml
+++ b/tomcat/osfingermap.yaml
@@ -86,12 +86,13 @@ Ubuntu-16.04:
   conf_dir: /etc/tomcat8
   main_config: /etc/default/tomcat8
   service: tomcat8
-  user: tomcat
-  group: tomcat
+  user: tomcat8
+  group: tomcat8
   catalina_base: /var/lib/tomcat8
   catalina_home: /usr/share/tomcat8
   catalina_pid: /var/run/tomcat8.pid
   catalina_tmpdir: /var/cache/tomcat8/temp
+  common_pkg: tomcat8-common
 Ubuntu-14.04:
   ver: 7
   pkg: tomcat7