test: Change containers configs to use hostnames

Set HostNameLookups On to get hostname in %{REMOTE_HOST}, no IP

Drop hardcoded IP addresses, no localhost (except client <-> proxy)

Tomcat container now does not exit when tomcat process is stopped

Minor files & format clean ups

Author: jajik

test/httpd/run.sh

@@ -2,17 +2,20 @@
 
 # copy the prepared conf file and include it
 cd /test/
+FILECONF=$(filename $CONF)
 if [ -f $CONF ]; then
-  FILECONF=$(filename $CONF)
   cp $CONF /usr/local/apache2/conf/
   echo "Include conf/$FILECONF" >> /usr/local/apache2/conf/httpd.conf
 else
   echo "The given CONF file: $CONF does not exist"
   exit 1
 fi
 
+if [ ! -z "$MPC_NAME" ]; then
+    sed -i "s/ServerName httpd-mod_proxy_cluster/ServerName ${MPC_NAME}/g" /usr/local/apache2/conf/$FILECONF
+fi
+
 # start apache httpd server in foreground
 echo "Starting httpd..."
 /usr/local/apache2/bin/apachectl start
 tail -f /usr/local/apache2/logs/error_log
-

test/tomcat/Containerfile

@@ -13,15 +13,16 @@ COPY target/mod_cluster-distribution-*-tomcat-${TESTSUITE_TOMCAT_VERSION}.zip /t
 RUN unzip /tmp/mod_cluster-distribution-*-tomcat-${TESTSUITE_TOMCAT_VERSION}.zip && \
     cp mod_cluster-distribution-*/lib/*.jar /usr/local/tomcat/lib/
 
-COPY $TESTSUITE_TOMCAT_CONFIG  ./conf/server.xml
-COPY $TESTSUITE_TOMCAT_CONTEXT ./conf/context.xml
+COPY $TESTSUITE_TOMCAT_CONFIG ./conf/server.xml
 COPY --chmod=755 start.sh ./
 
-ENV cluster_port=8090
-ENV cluster_address=127.0.0.1
+ENV proxy_port=8090
+ENV proxy_address=httpd-mod_proxy_cluster
 ENV jvm_route=
-ENV tomcat_address=
+ENV tomcat_address=localhost
+ENV tomcat_port=8080
+ENV tomcat_shutdown_port=8005
+ENV tomcat_ajp_port=8900
 ENV tomcat_port_offset=0
 
 CMD ["./start.sh"]
-

test/tomcat/server.xml

@@ -19,14 +19,12 @@
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
  -->
-<Server port="8005" shutdown="SHUTDOWN" address="tomcat_address" portOffset="port_offset">
+<Server port="tomcat_shutdown_port" shutdown="SHUTDOWN" address="tomcat_address" portOffset="port_offset">
   <Listener className="org.jboss.modcluster.container.tomcat.ModClusterListener"
-            connectorPort="8080"
+            connectorPort="tomcat_port"
             proxyList="proxy_address:proxy_port" />
   <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-  <!-- Security listener. Documentation at /docs/config/listeners.html
-  <Listener className="org.apache.catalina.security.SecurityListener" />
-  -->
+
   <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
@@ -55,75 +53,18 @@
    -->
   <Service name="Catalina">
 
-    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
-    <!--
-    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-        maxThreads="150" minSpareThreads="4"/>
-    -->
-
 
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html
-         Java AJP  Connector: /docs/config/ajp.html
-         APR (HTTP/AJP) Connector: /docs/apr.html
-         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-    -->
-    <Connector port="8080" protocol="HTTP/1.1"
+    <Connector port="tomcat_port" protocol="HTTP/1.1"
                address="tomcat_address"
                connectionTimeout="20000"
-               redirectPort="8443"
                portOffset="port_offset" />
-    <!-- A "Connector" using the shared thread pool-->
-    <!--
-    <Connector executor="tomcatThreadPool"
-               port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
-         This connector uses the NIO implementation. The default
-         SSLImplementation will depend on the presence of the APR/native
-         library and the useOpenSSL attribute of the
-         AprLifecycleListener.
-         Either JSSE or OpenSSL style configuration may be used regardless of
-         the SSLImplementation selected. JSSE style configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true">
-        <SSLHostConfig>
-            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
-         This connector uses the APR/native implementation which always uses
-         OpenSSL for TLS.
-         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
-         configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
-               maxThreads="150" SSLEnabled="true" >
-        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-        <SSLHostConfig>
-            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
-                         certificateFile="conf/localhost-rsa-cert.pem"
-                         certificateChainFile="conf/localhost-rsa-chain.pem"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
 
     <!-- Define an AJP 1.3 Connector on port 8900 -->
 
     <Connector protocol="AJP/1.3"
                address="tomcat_address"
-               port="8900"
+               port="tomcat_ajp_port"
                secretRequired="false"
-               redirectPort="8443"
                portOffset="port_offset" />
 
 
@@ -156,15 +97,9 @@
                resourceName="UserDatabase"/>
       </Realm>
 
-      <Host name="localhost"  appBase="webapps"
+      <Host name="tomcat_address" appBase="webapps"
             unpackWARs="true" autoDeploy="true">
 
-        <!-- SingleSignOn valve, share authentication between web applications
-             Documentation at: /docs/config/valve.html -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
              Note: The pattern used is equivalent to using pattern="common" -->

test/tomcat/start.sh

@@ -1,21 +1,23 @@
 #!/bin/bash
 
-sed -i "s/tomcat_address/${tomcat_address:-127.0.0.1}/g" ./conf/server.xml
-sed -i "s/port_offset/${tomcat_port_offset:-0}/g" ./conf/server.xml
-sed -i "s/proxy_port/${cluster_port:-8090}/g" ./conf/server.xml
-sed -i "s/proxy_address/${cluster_address:-127.0.0.1}/g" ./conf/server.xml
-sed -i "s/proxy_address/${cluster_address:-127.0.0.1}/g" ./conf/context.xml
-
 if [ ! -z ${jvm_route} ]; then
-  sed -i "/<Engine name=\"Catalina\"/c\<Engine name=\"Catalina\" defaultHost=\"localhost\" jvmRoute=\"${jvm_route}\">" ./conf/server.xml
+  sed -i "/<Engine name=\"Catalina\"/c\    <Engine name=\"Catalina\" defaultHost=\"tomcat_address\" jvmRoute=\"${jvm_route}\">" ./conf/server.xml
 fi
 
+sed -i "s/tomcat_address/${tomcat_address}/g" ./conf/server.xml
+sed -i "s/tomcat_port/${tomcat_port}/g" ./conf/server.xml
+sed -i "s/tomcat_shutdown_port/${tomcat_shutdown_port}/g" ./conf/server.xml
+sed -i "s/tomcat_ajp_port/${tomcat_ajp_port}/g" ./conf/server.xml
+sed -i "s/port_offset/${tomcat_port_offset}/g" ./conf/server.xml
+sed -i "s/proxy_port/${proxy_port}/g" ./conf/server.xml
+sed -i "s/proxy_address/${proxy_address}/g" ./conf/server.xml
+
 ls lib/jakartaee-migration-*.jar
 if [ $? = 0 ]; then
-  rm lib/mod_cluster-container-tomcat-9.0-*.Final-SNAPSHOT.jar
   mkdir webapps-javaee
-else
-  rm lib/mod_cluster-container-tomcat-10.1-*.Final-SNAPSHOT.jar
 fi
 
+# spawn the tomcat in a separate shell
 bin/catalina.sh run
+# just stay around even when the tomcat process gets killed
+while true; do cat /dev/null; done;