From 3306b26b1babd25c9a9c016796c1c4f745ad81f7 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Mon, 4 Mar 2024 15:53:44 -0500
Subject: [PATCH 01/42] Updates for DIT Port 8443 changes

---
 hyrax-builds/build_dmrpp/tomcat9-server.xml | 19 ++++----
 hyrax-builds/ngap/entrypoint.sh             | 53 +++++++++++++++++++++
 hyrax-builds/ngap/tomcat9-server.xml        |  9 ++--
 3 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/hyrax-builds/build_dmrpp/tomcat9-server.xml b/hyrax-builds/build_dmrpp/tomcat9-server.xml
index 8a61cf68..3b54e110 100644
--- a/hyrax-builds/build_dmrpp/tomcat9-server.xml
+++ b/hyrax-builds/build_dmrpp/tomcat9-server.xml
@@ -74,6 +74,7 @@
                connectionTimeout="20000"
                redirectPort="8443" / -->
 
+    <!--
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="20000"
                redirectPort="8443"
@@ -81,6 +82,7 @@
                compressionMinSize="2048"
                compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/octet-stream,application/vnd.opendap.dap4.dataset-services+xml,application/vnd.opendap.dap4.dataset-metadata+xml,application/vnd.opendap.dap4.data,application/vnd.opendap.dap4.error+xml,application/json,application/prs.coverage+json,application/rdf+xml,application/x-netcdf,image/tiff;application=geotiff"
     />
+    -->
 
     <!-- A "Connector" using the shared thread pool-->
     <!--
@@ -111,18 +113,17 @@
          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>
+      <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+      <SSLHostConfig>
+        <Certificate certificateKeyFile="conf/NGAP-CA-certificate.key"
+                     certificateFile="conf/NGAP-CA-certificate.crt"
+                     certificateChainFile="conf/NGAP-CA-certificate-chain.crt"
+                     type="RSA" />
+      </SSLHostConfig>
     </Connector>
-    -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
     <!--
diff --git a/hyrax-builds/ngap/entrypoint.sh b/hyrax-builds/ngap/entrypoint.sh
index 21be59c4..19438af4 100755
--- a/hyrax-builds/ngap/entrypoint.sh
+++ b/hyrax-builds/ngap/entrypoint.sh
@@ -62,6 +62,17 @@ echo "#     AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}" >&2
 export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:-"<not set>"}
 echo "#    AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}" >&2
 
+################################################################################
+echo "${HR2}" >&2
+export NGAP_CERTIFICATE_FILE="/usr/share/tomcat/conf/NGAP-CA-certificate.crt"
+echo "#   NGAP_CERTIFICATE_FILE: ${NGAP_CERTIFICATE_FILE}" >&2
+
+export NGAP_CERTIFICATE_CHAIN_FILE="/usr/share/tomcat/conf/NGAP-CA-certificate-chain.crt"
+echo "#   NGAP_CERTIFICATE_CHAIN_FILE: ${NGAP_CERTIFICATE_CHAIN_FILE}" >&2
+
+export NGAP_CERTIFICATE_KEY="/usr/share/tomcat/conf/NGAP-CA-certificate.key"
+echo "#   NGAP_CERTIFICATE_KEY: ${NGAP_CERTIFICATE_KEY}" >&2
+
 ################################################################################
 echo "${HR2}" >&2
 export NETRC_FILE="/etc/bes/ngap_netrc"
@@ -173,6 +184,48 @@ fi
 ################################################################################
 
 
+################################################################################
+# Inject Tomcat's NGAP[CA] certificate document to configure the Tomcat to
+# utilize SSL/TLS Data-In-Transit in the NGAP environment.
+#
+# Test if the bes.conf env variable is set (by way of not unset) and not empty
+if test -n "${NGAP_CERTIFICATE}" ; then
+    echo "${HR2}" >&2
+    echo "# Tomcat  file: ${NGAP_CERTIFICATE_FILE}" >&2
+    echo "${NGAP_CERTIFICATE}" > ${NGAP_CERTIFICATE_FILE}
+    cat "${NGAP_CERTIFICATE_FILE}" | awk '{print "##    "$0;}' >&2
+    echo "#" >&2
+fi
+################################################################################
+
+################################################################################
+# Inject Tomcat's NGAP[CA] certificate-chain to configure the Tomcat to
+# utilize SSL/TLS Data-In-Transit in the NGAP environment.
+#
+# Test if the bes.conf env variable is set (by way of not unset) and not empty
+if test -n "${NGAP_CERTIFICATE_CHAIN}" ; then
+    echo "${HR2}" >&2
+    echo "# Tomcat  file: ${NGAP_CREDENTIALS_CHAIN_FILE}" >&2
+    echo "${NGAP_CERTIFICATE_CHAIN}" > ${NGAP_CERTIFICATE_CHAIN_FILE}
+    cat "${NGAP_CERTIFICATE_CHAIN_FILE}" | awk '{print "##    "$0;}' >&2
+    echo "#" >&2
+fi
+################################################################################
+
+################################################################################
+# Inject Tomcat's NGAP[CA] certificate key to configure the Tomcat to
+# utilize SSL/TLS Data-In-Transit in the NGAP environment.
+#
+# Test if the bes.conf env variable is set (by way of not unset) and not empty
+if test -n "${NGAP_CERTIFICATE_KEY}" ; then
+    echo "${HR2}" >&2
+    echo "# Tomcat  file: ${NGAP_CERTIFICATE_KEY_FILE}" >&2
+    echo "${NGAP_CERTIFICATE_KEY}" > ${NGAP_CERTIFICATE_KEY_FILE}
+    cat "${NGAP_CERTIFICATE_KEY_FILE}" | awk '{print "##    "$0;}' >&2
+    echo "#" >&2
+fi
+################################################################################
+
 ################################################################################
 # Inject an NGAP Cumulus Configuration
 # Only amend the /etc/bes/site.conf file if all the necessary environment
diff --git a/hyrax-builds/ngap/tomcat9-server.xml b/hyrax-builds/ngap/tomcat9-server.xml
index 412bcfac..c2c048f2 100644
--- a/hyrax-builds/ngap/tomcat9-server.xml
+++ b/hyrax-builds/ngap/tomcat9-server.xml
@@ -111,18 +111,17 @@
          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"
+            <Certificate certificateKeyFile="conf/NGAP-CA-certificate.key"
+                         certificateFile="conf/NGAP-CA-certificate.crt"
+                         certificateChainFile="conf/NGAP-CA-certificate-chain.crt"
                          type="RSA" />
         </SSLHostConfig>
     </Connector>
-    -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
     <!-- Connector port="8009" protocol="AJP/1.3" redirectPort="8443" / -->

From f8592bc5534ba908a56a7d8d81e6bafed42d3572 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Tue, 5 Mar 2024 09:30:55 -0800
Subject: [PATCH 02/42] travis time

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d6965667..d60e7537 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ services:
 branches:
   only:
     - master
+    - /^(.*-test-deploy)$/
 
 notifications:
   email:
@@ -296,4 +297,4 @@ deploy:
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
       branch: master
-      condition: ${DEPLOY_ME} = "true"
+      condition: ${DEPLOY_ME} = "true" OR branch =~ ^(.*-test-deploy)$

From 6c243e85b5d1cd48df81c9f9d5a681e74d34a0d4 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Tue, 5 Mar 2024 15:32:03 -0500
Subject: [PATCH 03/42] NoOp Comment to push

---
 hyrax-builds/build_dmrpp/tomcat9-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyrax-builds/build_dmrpp/tomcat9-server.xml b/hyrax-builds/build_dmrpp/tomcat9-server.xml
index 3b54e110..39f853f0 100644
--- a/hyrax-builds/build_dmrpp/tomcat9-server.xml
+++ b/hyrax-builds/build_dmrpp/tomcat9-server.xml
@@ -113,7 +113,7 @@
          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" />

From 6c83fe4695fedcf9b7e9cb7545e3dd725026920a Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Tue, 5 Mar 2024 16:01:43 -0500
Subject: [PATCH 04/42] Force deploy_me for ngap:snapshot

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index d60e7537..bc10e6ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -227,6 +227,7 @@ jobs:
       script:
         - cd hyrax-builds
         - export DOCKER_NAME="ngap"
+        - export DEPLOY_ME=true
         - source ./build-rh8
         - export SNAPSHOT_IMAGE_TAG="opendap/hyrax:${DOCKER_NAME}-snapshot"
         - export BUILD_VERSION_TAG=opendap/hyrax:${DOCKER_NAME}-${HYRAX_VERSION}

From c539f2880c8ae85a2fe6a0b9dd72ca6087936ca2 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Tue, 5 Mar 2024 16:45:18 -0500
Subject: [PATCH 05/42] Forcing deploy on test branch

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc10e6ff..86b472e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -227,7 +227,6 @@ jobs:
       script:
         - cd hyrax-builds
         - export DOCKER_NAME="ngap"
-        - export DEPLOY_ME=true
         - source ./build-rh8
         - export SNAPSHOT_IMAGE_TAG="opendap/hyrax:${DOCKER_NAME}-snapshot"
         - export BUILD_VERSION_TAG=opendap/hyrax:${DOCKER_NAME}-${HYRAX_VERSION}
@@ -286,7 +285,7 @@ jobs:
         - export TEST_IMAGE=opendap/hyrax:${HYRAX_VERSION}
         - echo "Running Hyrax Regression Test Script on ${TEST_IMAGE}"
         - ./regression_test_script -i "${TEST_IMAGE}"
-        - export DEPLOY_ME="false"
+        - export DEPLOY_ME="true"
 
 before_deploy:
   - export DOCKER_LOGIN=`aws ecr get-login --region us-east-1 | sed "s/-e none //g"`;

From e4fb5753e9c25345ba935aa0ba2dae12a21530fc Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 10:51:10 -0500
Subject: [PATCH 06/42] Forcing test-deploy

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 86b472e4..b1389698 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ services:
 branches:
   only:
     - master
+    - main
     - /^(.*-test-deploy)$/
 
 notifications:

From fa1935ded13b13608316e92123a6264cd436b821 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 08:17:36 -0800
Subject: [PATCH 07/42] wip

---
 .travis.yml                       |  4 +-
 hyrax-builds/ngap/beslog2json.awk | 91 +++++++++++--------------------
 2 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1389698..02797b2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -297,5 +297,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      branch: master
-      condition: ${DEPLOY_ME} = "true" OR branch =~ ^(.*-test-deploy)$
+      branch: master OR branch =~ ^(.*-test-deploy)$
+      condition: ${DEPLOY_ME} = "true"
diff --git a/hyrax-builds/ngap/beslog2json.awk b/hyrax-builds/ngap/beslog2json.awk
index 0356aa51..ce12e677 100755
--- a/hyrax-builds/ngap/beslog2json.awk
+++ b/hyrax-builds/ngap/beslog2json.awk
@@ -2,6 +2,7 @@
 # Translates OPeNDAP bes.logs into JSON
 #
 BEGIN {
+
     FS="\\|&\\|";
 
     if(debug!="true"){
@@ -29,13 +30,13 @@ BEGIN {
     # Log line base.
 
     # The time that the log message was written.
-    log_line_base[1]="time";
+    log_line_base[1]="hyrax-time";
 
     # The PID of the beslistener that wrote the log entry.
-    log_line_base[2]="pid";
+    log_line_base[2]="hyrax-pid";
 
     # The message associate with the log entry
-    log_line_base[3]="log_name";
+    log_line_base[3]="hyrax-log_name";
 
 
 
@@ -46,96 +47,66 @@ BEGIN {
 # 1601646465|&|2122|&|request|&|OLFS|&|0:0:0:0:0:0:0:1|&|USER_AGENT|&|92F3C71F959B56515C98A09088CA2A8E|&|-|&|1601646465304|&|18|&|HTTP-GET|&|/opendap/hyrax/data/nc/fnoc1.nc.dds|&|u|&|BES|&|get.dds|&|dap2|&|/Users/ndp/OPeNDAP/hyrax/build/share/hyrax/data/nc/fnoc1.nc|&|u
 
     # OLFS Tag.
-    request_log_fields[4]="OLFS";
+    request_log_fields[4]="hyrax-OLFS";
 
     # ip-address of requesting client's system.
-    request_log_fields[5]="client_ip";
+    request_log_fields[5]="hyrax-client_ip";
 
     # The value of the User-Agent request header sent from the client.
-    request_log_fields[6]="user_agent";
+    request_log_fields[6]="hyrax-user_agent";
 
     # The session id, if present.
-    request_log_fields[7]="session_id";
+    request_log_fields[7]="hyrax-session_id";
 
     # The user's user id, if a user is logged in.
-    request_log_fields[8]="user_id";
+    request_log_fields[8]="hyrax-user_id";
 
     # The time the the request was received.
-    request_log_fields[9]="start_time";
+    request_log_fields[9]="hyrax-start_time";
 
     # We are not so sure what this number is...
-    request_log_fields[10]="duration";
+    request_log_fields[10]="hyrax-duration";
 
     # The HTTP verb of the request (GET, POST, etc)
-    request_log_fields[11]="http_verb";
+    request_log_fields[11]="hyrax-http_verb";
 
     # The path component of the requested resource.
-    request_log_fields[12]="url_path";
+    request_log_fields[12]="hyrax-url_path";
 
     # The query string, if any, submitted with the request.
-    request_log_fields[13]="query_string";
+    request_log_fields[13]="hyrax-query_string";
 
     # Field 13 is a field that indicates the following fields orginated
     # in the BES, it is not semantically important to NGAP
-    request_log_fields[14]="bes";
+    request_log_fields[14]="hyrax-bes";
 
     # The type of BES action/request/command invoked by the request
-    request_log_fields[15]="bes_request";
+    request_log_fields[15]="hyrax-bes_request";
 
     # The DAP protocl
-    request_log_fields[16]="dap_version";
+    request_log_fields[16]="hyrax-dap_version";
 
     # The local file path to the resource.
-    request_log_fields[17]="local_path";
+    request_log_fields[17]="hyrax-local_path";
 
     # Field 18 is a duplicate of field 13 and if the query string is absent
     # then field 18 will be missing entirely.
-    request_log_fields[18]="constraint_expression";
+    request_log_fields[18]="hyrax-constraint_expression";
 
     # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
     # Error/Verbose/Info Fields
 
     # The message associate with the log entry
-    msg_fields[4]="message";
-
+    msg_fields[4]="hyrax-message";
 
     # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
     # Start Timing Fields
     # 1601642669|&|2122|&|timing|&|start_us|&|1601642669943035|&|ReqId|&|TIMER_NAME
 
-    # The message associate with the log entry
-    start_time_fields[4]="start_us";
-
-    # The message associate with the log entry
-    start_time_fields[5]="start_time_us";
-
-    # The message associate with the log entry
-    start_time_fields[6]="ReqId";
-
-    # The message associate with the log entry
-    start_time_fields[7]="Name";
-
     # -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
     # Stop Timing Fields
     # 1601642669|&|2122|&|timing|&|stop_us|&|1601642669944587|&|elapsed_us|&|1552|&ReqId|&|TIMER_NAME
     #     1          2      3         4            5               6           7     8        9
-    # The message associate with the log entry
-    stop_time_fields[4]="stop_us";
-
-    # The message associate with the log entry
-    stop_time_fields[5]="stop_time_us";
-
-    # The message associate with the log entry
-    stop_time_fields[6]="elapsed_us";
-
-    # The message associate with the log entry
-    stop_time_fields[6]="elapsed_time_us";
-
-    # The message associate with the log entry
-    stop_time_fields[7]="ReqId";
-
-    # The message associate with the log entry
-    stop_time_fields[4]="Name";
 
 
 }
@@ -152,9 +123,9 @@ BEGIN {
     pid=$2;
     log_name=$3;
     printf("{%s", n);
-    printf("%s\"time\": %s, %s", indent, ltime, n);
-    printf("%s\"pid\": \"%s\", %s", indent, pid, n);
-    printf("%s\"type\": \"%s\"", indent, log_name);
+    printf("%s\"hyrax-time\": %s, %s", indent, ltime, n);
+    printf("%s\"hyrax-pid\": \"%s\", %s", indent, pid, n);
+    printf("%s\"hyrax-type\": \"%s\"", indent, log_name);
 
     if(log_name=="request"){
         for(i=4; i<=NF  ; i++){
@@ -180,18 +151,18 @@ BEGIN {
         if(time_type=="start_us"){
             # 1601642669|&|2122|&|timing|&|start_us|&|1601642669945133|&|-|&|TIMER_NAME
             #      1         2      3        4             5             6      7
-            printf(", %s%s\"%s\": %s", n, indent, "start_time_us", $5);
-            printf(", %s%s\"%s\": \"%s\"", n, indent, "req_id", $6);
-            printf(", %s%s\"%s\": \"%s\"", n, indent, "name:", $7);
+            printf(", %s%s\"%s\": %s", n, indent, "hyrax-start_time_us", $5);
+            printf(", %s%s\"%s\": \"%s\"", n, indent, "hyrax-req_id", $6);
+            printf(", %s%s\"%s\": \"%s\"", n, indent, "hyrax-name:", $7);
         }
         else if(time_type=="elapsed_us"){
             #1601653546|&|7096|&|timing|&|elapsed_us|&|2169|&|start_us|&|1601653546269617|&|stop_us|&|1601653546271786|&|ReqId|&|TIMER_NAME
             #     1          2      3         4          5        6            7                8           9              10       11
-            printf(", %s%s\"%s\": %s", n, indent, "elapsed_time_us", $5);
-            printf(", %s%s\"%s\": %s", n, indent, "start_time_us", $7);
-            printf(", %s%s\"%s\": %s", n, indent, "stop_time_us", $9);
-            printf(", %s%s\"%s\": \"%s\"", n, indent, "req_id", $10);
-            printf(", %s%s\"%s\": \"%s\"", n, indent,  "name:", $11);
+            printf(", %s%s\"%s\": %s", n, indent, "hyrax-elapsed_time_us", $5);
+            printf(", %s%s\"%s\": %s", n, indent, "hyrax-start_time_us", $7);
+            printf(", %s%s\"%s\": %s", n, indent, "hyrax-stop_time_us", $9);
+            printf(", %s%s\"%s\": \"%s\"", n, indent, "hyrax-req_id", $10);
+            printf(", %s%s\"%s\": \"%s\"", n, indent,  "hyrax-name:", $11);
 
         }
         else {

From 24881bedfadc18862bf082d60dcda77ecbf715f5 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 08:40:11 -0800
Subject: [PATCH 08/42] deploy mimics bes proj

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 02797b2d..2dcc425c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -297,5 +297,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      branch: master OR branch =~ ^(.*-test-deploy)$
+      all_branches: true
       condition: ${DEPLOY_ME} = "true"

From e9c6959c561ea16e78d33d5a97468fc5936be00f Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 08:47:33 -0800
Subject: [PATCH 09/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2dcc425c..2fef1d00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -286,7 +286,7 @@ jobs:
         - export TEST_IMAGE=opendap/hyrax:${HYRAX_VERSION}
         - echo "Running Hyrax Regression Test Script on ${TEST_IMAGE}"
         - ./regression_test_script -i "${TEST_IMAGE}"
-        - export DEPLOY_ME="true"
+        - export DEPLOY_ME="false"
 
 before_deploy:
   - export DOCKER_LOGIN=`aws ecr get-login --region us-east-1 | sed "s/-e none //g"`;

From bc64625ca24a21797dfb77da841a56dc074ccd19 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 08:48:56 -0800
Subject: [PATCH 10/42] wip

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2fef1d00..d6965667 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ services:
 branches:
   only:
     - master
-    - main
-    - /^(.*-test-deploy)$/
 
 notifications:
   email:
@@ -297,5 +295,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      all_branches: true
+      branch: master
       condition: ${DEPLOY_ME} = "true"

From 802ff8b1f745cfaf38d04c0fa086d80e0401e7bf Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 08:56:44 -0800
Subject: [PATCH 11/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d6965667..3de7d85c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ env:
 
 before_install:
   - pip3 install awscli
-  - if test "${TRAVIS_PULL_REQUEST}" = "false"; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
+  - if test "${TRAVIS_PULL_REQUEST}" = "false" || test "${branch}" =~ ^(.*-test-deploy)$; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
 
 install:
   - echo "print env:"

From f550d8fa80eaa42b5aaac9143d7d642365ef93fb Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 13:05:13 -0500
Subject: [PATCH 12/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3de7d85c..e1a1a3e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ env:
 
 before_install:
   - pip3 install awscli
-  - if test "${TRAVIS_PULL_REQUEST}" = "false" || test "${branch}" =~ ^(.*-test-deploy)$; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
+  - if test "${TRAVIS_PULL_REQUEST}" == "false" || test "${branch}" =~ ^(.*-test-deploy)$; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
 
 install:
   - echo "print env:"

From 8900cab4e9e6e668312afd29865f7d11c3f2a6e3 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 13:23:37 -0500
Subject: [PATCH 13/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e1a1a3e9..3a2e01b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ env:
 
 before_install:
   - pip3 install awscli
-  - if test "${TRAVIS_PULL_REQUEST}" == "false" || test "${branch}" =~ ^(.*-test-deploy)$; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
+  - if test "$TRAVIS_PULL_REQUEST" = "false" || test "${branch}" =~ ^(.*-test-deploy)$; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
 
 install:
   - echo "print env:"

From 13fb03e880bb01a54d7b2807cd2ca303be621f4b Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 11:26:25 -0800
Subject: [PATCH 14/42] Bash regex eval is does not use 'test'

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3a2e01b7..a106acd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ env:
 
 before_install:
   - pip3 install awscli
-  - if test "$TRAVIS_PULL_REQUEST" = "false" || test "${branch}" =~ ^(.*-test-deploy)$; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
+  - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "${branch}" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
 
 install:
   - echo "print env:"

From b47f1f37bc855499271d1dd6d2719c46402644e6 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 15:04:51 -0500
Subject: [PATCH 15/42] wip

---
 hyrax-builds/build_dmrpp/tomcat9-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyrax-builds/build_dmrpp/tomcat9-server.xml b/hyrax-builds/build_dmrpp/tomcat9-server.xml
index 39f853f0..3b54e110 100644
--- a/hyrax-builds/build_dmrpp/tomcat9-server.xml
+++ b/hyrax-builds/build_dmrpp/tomcat9-server.xml
@@ -113,7 +113,7 @@
          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" />

From c08097575f7aa826dd360996269461e7b2cebb0c Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:23:43 -0800
Subject: [PATCH 16/42] wip

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a106acd7..14dcd88a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -295,5 +295,4 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      branch: master
       condition: ${DEPLOY_ME} = "true"

From dd8d19a3c5f52fd18f1d3771e38d82a7b8fbb8cf Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:26:20 -0800
Subject: [PATCH 17/42] wip

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 14dcd88a..ee05a6e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ services:
 branches:
   only:
     - master
+    - main
+    - /^(.*-test-deploy)$/
 
 notifications:
   email:

From de2aafb92895a7ff4cbd7cb25315c6812ff16c20 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:27:04 -0800
Subject: [PATCH 18/42] wip

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ee05a6e0..2980d4bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -297,4 +297,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
+      all-branches: true
       condition: ${DEPLOY_ME} = "true"

From 994da561417049a76c77fc88ca6ae6bd8fe05a0e Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:27:59 -0800
Subject: [PATCH 19/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2980d4bb..67145b58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -297,5 +297,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      all-branches: true
+      all_branches: true
       condition: ${DEPLOY_ME} = "true"

From 4001466b0cb02d77b7a668e9a3d8eed5dab81e2c Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:28:54 -0800
Subject: [PATCH 20/42] wip

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 67145b58..d6cea62b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ branches:
   only:
     - master
     - main
-    - /^(.*-test-deploy)$/
 
 notifications:
   email:

From 42c176243244361ea9f9592630ed59aabf2c577d Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:29:39 -0800
Subject: [PATCH 21/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d6cea62b..ec6bbe60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -296,5 +296,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      all_branches: true
+      branch: master
       condition: ${DEPLOY_ME} = "true"

From 1a6a77b54f836fbf1cc106f3ba687e4e18b58721 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:31:15 -0800
Subject: [PATCH 22/42] wip

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec6bbe60..1bbfc543 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,9 @@ services:
 
 branches:
   only:
-    - master
-    - main
+  - master
+  - main
+  - /^(.*-test-deploy)$/
 
 notifications:
   email:

From d72a7e3241e1002f62b40584a92a54456f08513d Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:32:30 -0800
Subject: [PATCH 23/42] wip

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1bbfc543..7b12810f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ branches:
   only:
   - master
   - main
-  - /^(.*-test-deploy)$/
+  - ngap-dit-test-deploy
 
 notifications:
   email:
@@ -297,5 +297,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      branch: master
+      all_branches: true
       condition: ${DEPLOY_ME} = "true"

From d6f25f2fa809695aae58bee7506bda2776d9bb1b Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:33:33 -0800
Subject: [PATCH 24/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7b12810f..a8fc7697 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -297,5 +297,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      all_branches: true
+      branch: ngap-dit-test-deploy
       condition: ${DEPLOY_ME} = "true"

From f81a05a0ce9a7270c77024cc978fc46ed6a025f2 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:34:22 -0800
Subject: [PATCH 25/42] wip

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a8fc7697..4f801c9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,9 @@ services:
 
 branches:
   only:
-  - master
-  - main
-  - ngap-dit-test-deploy
+    - master
+    - main
+    - ngap-dit-test-deploy
 
 notifications:
   email:

From 70a834148731017674ffe975b4b8bb3c47e4544c Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:35:13 -0800
Subject: [PATCH 26/42] wip

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4f801c9b..ec6bbe60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ branches:
   only:
     - master
     - main
-    - ngap-dit-test-deploy
 
 notifications:
   email:
@@ -297,5 +296,5 @@ deploy:
   - provider: script
     script: bash ${TRAVIS_BUILD_DIR}/deploy_to_docker_hub.sh
     on:
-      branch: ngap-dit-test-deploy
+      branch: master
       condition: ${DEPLOY_ME} = "true"

From 71ad45528a84f15f2b0d55b54dbca4038659267d Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:37:02 -0800
Subject: [PATCH 27/42] wip

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ec6bbe60..a156b3b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,6 +59,7 @@ env:
 before_install:
   - pip3 install awscli
   - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "${branch}" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
+  - echo "DEPLOY_ME is ${DEPLOY_ME}"
 
 install:
   - echo "print env:"

From d5785834729b39a93686809b9f6a98e30c8a6409 Mon Sep 17 00:00:00 2001
From: ndp-opendap <ndp@opendap.org>
Date: Wed, 6 Mar 2024 12:41:24 -0800
Subject: [PATCH 28/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a156b3b9..4a70dab5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ env:
 before_install:
   - pip3 install awscli
   - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "${branch}" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
-  - echo "DEPLOY_ME is ${DEPLOY_ME}"
+  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}"
 
 install:
   - echo "print env:"

From db0ed5d1bbe3f1a697c452b10695e9ae707b391f Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 16:06:23 -0500
Subject: [PATCH 29/42] wip

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a70dab5..a542aeac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,9 @@ services:
 
 branches:
   only:
-    - master
-    - main
+  - master
+  - main
+  - /^(.*-test-deploy)$/
 
 notifications:
   email:
@@ -59,7 +60,7 @@ env:
 before_install:
   - pip3 install awscli
   - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "${branch}" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
-  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}"
+  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}, BRANCH is $branch"
 
 install:
   - echo "print env:"

From 818a28d003896dc01ebad43c89ccfa68e0c5774c Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 16:24:39 -0500
Subject: [PATCH 30/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a542aeac..cca8d29c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ env:
 before_install:
   - pip3 install awscli
   - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "${branch}" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
-  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}, BRANCH is $branch"
+  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}, TRAVIS_BRANCH is $TRAVIS_BRANCH, BRANCH is $branch"
 
 install:
   - echo "print env:"

From bffb9e6affc98744433330c790e7d77f66321309 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 16:30:55 -0500
Subject: [PATCH 31/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cca8d29c..31e6f5cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ env:
 before_install:
   - pip3 install awscli
   - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "${branch}" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
-  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}, TRAVIS_BRANCH is $TRAVIS_BRANCH, BRANCH is $branch"
+  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}, TRAVIS_PULL_REQUEST_BRANCH is $TRAVIS_PULL_REQUEST_BRANCH, BRANCH is $branch"
 
 install:
   - echo "print env:"

From 8065bf6c900b3b5a5c73ef8bc115a29285237057 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 6 Mar 2024 16:34:33 -0500
Subject: [PATCH 32/42] wip

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31e6f5cb..2dc21c98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,8 +59,8 @@ env:
 
 before_install:
   - pip3 install awscli
-  - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "${branch}" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
-  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}, TRAVIS_PULL_REQUEST_BRANCH is $TRAVIS_PULL_REQUEST_BRANCH, BRANCH is $branch"
+  - if test "$TRAVIS_PULL_REQUEST" = "false" || [[ "$TRAVIS_PULL_REQUEST_BRANCH" =~ ^(.*-test-deploy)$ ]]; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
+  - echo "TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST, DEPLOY_ME is ${DEPLOY_ME}, TRAVIS_PULL_REQUEST_BRANCH is $TRAVIS_PULL_REQUEST_BRANCH"
 
 install:
   - echo "print env:"

From 2d992141bbdff734a7d73eacefbc527b917bccf4 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Thu, 7 Mar 2024 12:40:04 -0500
Subject: [PATCH 33/42] wip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2dc21c98..6fc3aa38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -287,7 +287,7 @@ jobs:
         - export TEST_IMAGE=opendap/hyrax:${HYRAX_VERSION}
         - echo "Running Hyrax Regression Test Script on ${TEST_IMAGE}"
         - ./regression_test_script -i "${TEST_IMAGE}"
-        - export DEPLOY_ME="false"
+        - export DEPLOY_ME="true"
 
 before_deploy:
   - export DOCKER_LOGIN=`aws ecr get-login --region us-east-1 | sed "s/-e none //g"`;

From 8ad6daa6f6081cdfd1f6cc8e08e77f7c33840f61 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Tue, 12 Mar 2024 15:23:06 -0400
Subject: [PATCH 34/42] Missing comment on Connector 8080

---
 hyrax-builds/ngap/tomcat9-server.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hyrax-builds/ngap/tomcat9-server.xml b/hyrax-builds/ngap/tomcat9-server.xml
index c2c048f2..23f93f79 100644
--- a/hyrax-builds/ngap/tomcat9-server.xml
+++ b/hyrax-builds/ngap/tomcat9-server.xml
@@ -74,6 +74,7 @@
                connectionTimeout="20000"
                redirectPort="8443" / -->
 
+    <!--
     <Connector port="8080" protocol="HTTP/1.1"
                connectionTimeout="1000000"
                redirectPort="8443"
@@ -81,6 +82,7 @@
                compressionMinSize="2048"
                compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/octet-stream,application/vnd.opendap.dap4.dataset-services+xml,application/vnd.opendap.dap4.dataset-metadata+xml,application/vnd.opendap.dap4.data,application/vnd.opendap.dap4.error+xml,application/json,application/prs.coverage+json,application/rdf+xml,application/x-netcdf,image/tiff;application=geotiff"
     />
+    -->
 
     <!-- A "Connector" using the shared thread pool-->
     <!--

From 9d59fbe82af4cf36b09e86c7774fafa2f3edcd6a Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 13 Mar 2024 10:19:09 -0400
Subject: [PATCH 35/42] Incorrect redirect location

---
 hyrax-builds/ngap/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyrax-builds/ngap/entrypoint.sh b/hyrax-builds/ngap/entrypoint.sh
index 19438af4..28ff0100 100755
--- a/hyrax-builds/ngap/entrypoint.sh
+++ b/hyrax-builds/ngap/entrypoint.sh
@@ -71,7 +71,7 @@ export NGAP_CERTIFICATE_CHAIN_FILE="/usr/share/tomcat/conf/NGAP-CA-certificate-c
 echo "#   NGAP_CERTIFICATE_CHAIN_FILE: ${NGAP_CERTIFICATE_CHAIN_FILE}" >&2
 
 export NGAP_CERTIFICATE_KEY="/usr/share/tomcat/conf/NGAP-CA-certificate.key"
-echo "#   NGAP_CERTIFICATE_KEY: ${NGAP_CERTIFICATE_KEY}" >&2
+echo "#   NGAP_CERTIFICATE_KEY: ${NGAP_CERTIFICATE_KEY_FILE}" >&2
 
 ################################################################################
 echo "${HR2}" >&2

From 562293ec0cd09425ace1648c57bf704dfbde97d8 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 13 Mar 2024 12:11:05 -0400
Subject: [PATCH 36/42] Use fullpaths to CA certificates

---
 hyrax-builds/ngap/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyrax-builds/ngap/entrypoint.sh b/hyrax-builds/ngap/entrypoint.sh
index 28ff0100..befb0c11 100755
--- a/hyrax-builds/ngap/entrypoint.sh
+++ b/hyrax-builds/ngap/entrypoint.sh
@@ -70,7 +70,7 @@ echo "#   NGAP_CERTIFICATE_FILE: ${NGAP_CERTIFICATE_FILE}" >&2
 export NGAP_CERTIFICATE_CHAIN_FILE="/usr/share/tomcat/conf/NGAP-CA-certificate-chain.crt"
 echo "#   NGAP_CERTIFICATE_CHAIN_FILE: ${NGAP_CERTIFICATE_CHAIN_FILE}" >&2
 
-export NGAP_CERTIFICATE_KEY="/usr/share/tomcat/conf/NGAP-CA-certificate.key"
+export NGAP_CERTIFICATE_KEY_FILE="/usr/share/tomcat/conf/NGAP-CA-certificate.key"
 echo "#   NGAP_CERTIFICATE_KEY: ${NGAP_CERTIFICATE_KEY_FILE}" >&2
 
 ################################################################################

From c9b485c0f419ba159d656c0e81dbbc6dc96bf03e Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 13 Mar 2024 13:39:43 -0400
Subject: [PATCH 37/42] Use fullpaths for certificate files

---
 hyrax-builds/ngap/tomcat9-server.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hyrax-builds/ngap/tomcat9-server.xml b/hyrax-builds/ngap/tomcat9-server.xml
index 23f93f79..35114d38 100644
--- a/hyrax-builds/ngap/tomcat9-server.xml
+++ b/hyrax-builds/ngap/tomcat9-server.xml
@@ -118,9 +118,9 @@
                maxThreads="150" SSLEnabled="true" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>
-            <Certificate certificateKeyFile="conf/NGAP-CA-certificate.key"
-                         certificateFile="conf/NGAP-CA-certificate.crt"
-                         certificateChainFile="conf/NGAP-CA-certificate-chain.crt"
+            <Certificate certificateKeyFile="/usr/share/tomcat/conf/NGAP-CA-certificate.key"
+                         certificateFile="/usr/share/tomcat/conf/NGAP-CA-certificate.crt"
+                         certificateChainFile="/usr/share/tomcat/conf/NGAP-CA-certificate-chain.crt"
                          type="RSA" />
         </SSLHostConfig>
     </Connector>

From 07077a026df8291305c7169989738786b6e9c0d7 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Mon, 18 Mar 2024 13:06:16 -0400
Subject: [PATCH 38/42] APR library additions

---
 hyrax-builds/ngap/Dockerfile    |  5 +++++
 hyrax-builds/ngap/entrypoint.sh | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/hyrax-builds/ngap/Dockerfile b/hyrax-builds/ngap/Dockerfile
index 0bd7b31f..e2170184 100644
--- a/hyrax-builds/ngap/Dockerfile
+++ b/hyrax-builds/ngap/Dockerfile
@@ -104,6 +104,11 @@ RUN set -e && dnf install -y python3 git bc valgrind gdb
 RUN set -e && dnf install -y java-11-openjdk-devel
 # Temporary Hack to fix broken OpenJDK-11.0.20.0.8-2
 RUN set -e && dnf install -y tzdata-java
+# Temporary Hack to add missing Apache Portable Runtime library for Tomcat
+RUN set -e && dnf install -y ant
+RUN set -e && dnf install -y redhat-rpm-config
+RUN set -e && dnf install -y apr-devel
+RUN set -e && dnf install -y openssl-devel
 #
 RUN set -e && dnf clean all
 #
diff --git a/hyrax-builds/ngap/entrypoint.sh b/hyrax-builds/ngap/entrypoint.sh
index befb0c11..b80f78cd 100755
--- a/hyrax-builds/ngap/entrypoint.sh
+++ b/hyrax-builds/ngap/entrypoint.sh
@@ -395,6 +395,22 @@ besd_pid=`ps aux | grep /usr/bin/besdaemon | grep -v grep | awk '{print $2;}' -
 echo "# The besd is UP! [pid: ${besd_pid}]" >&2
 echo "#" >&2
 
+#-------------------------------------------------------------------------------
+# Build Tomcat native-apr library
+#
+echo "${HRT}" >&2
+echo "#    Building tomcat/native APR library..." >&2
+
+export JAVA_HOME="$(dirname $(dirname $(readlink -f $(which javac))))"
+
+cd ${CATALINA_HOME}/bin
+tar xvfz tomcat-native-1.3.0.tar.gz
+cd tomcat-native-1.3.0-src/native
+./configure
+make
+make install
+
+
 #-------------------------------------------------------------------------------
 # Start Tomcat process
 #

From 80e59bc688ee8f937e0d5d202bc80267e6f3422c Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Mon, 18 Mar 2024 15:33:50 -0400
Subject: [PATCH 39/42] Remove APR library changes

---
 hyrax-builds/ngap/entrypoint.sh | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/hyrax-builds/ngap/entrypoint.sh b/hyrax-builds/ngap/entrypoint.sh
index b80f78cd..befb0c11 100755
--- a/hyrax-builds/ngap/entrypoint.sh
+++ b/hyrax-builds/ngap/entrypoint.sh
@@ -395,22 +395,6 @@ besd_pid=`ps aux | grep /usr/bin/besdaemon | grep -v grep | awk '{print $2;}' -
 echo "# The besd is UP! [pid: ${besd_pid}]" >&2
 echo "#" >&2
 
-#-------------------------------------------------------------------------------
-# Build Tomcat native-apr library
-#
-echo "${HRT}" >&2
-echo "#    Building tomcat/native APR library..." >&2
-
-export JAVA_HOME="$(dirname $(dirname $(readlink -f $(which javac))))"
-
-cd ${CATALINA_HOME}/bin
-tar xvfz tomcat-native-1.3.0.tar.gz
-cd tomcat-native-1.3.0-src/native
-./configure
-make
-make install
-
-
 #-------------------------------------------------------------------------------
 # Start Tomcat process
 #

From 4f07c0542bacd4ec512079e8ff31f55d8717ba5b Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Mon, 18 Mar 2024 15:34:27 -0400
Subject: [PATCH 40/42] Build Tomcat APR Library

---
 hyrax-builds/ngap/Dockerfile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/hyrax-builds/ngap/Dockerfile b/hyrax-builds/ngap/Dockerfile
index e2170184..74f1c8ff 100644
--- a/hyrax-builds/ngap/Dockerfile
+++ b/hyrax-builds/ngap/Dockerfile
@@ -171,6 +171,20 @@ RUN set -e \
     && echo "Cleaning up Tomcat distribution files..." >&2 \
     && rm -fv "/${TOMCAT_DISTRO}.tar.gz"  >&2
 
+# Install the Tomcat Native-APR library.
+#
+RUN set -e \
+    && export JAVA_HOME="$(dirname $(dirname $(readlink -f $(which javac))))" >&2 \
+    && echo $JAVA_HOME >&2 \
+    && tar -xvf "/${CATALINA_HOME}/bin/tomcat-native.tar.gz" -C ${CATALINA_HOME}/bin >&2 \
+    && cd ${CATALINA_HOME}/bin/tomcat-native-1.3.0-src/native >&2 \
+    && ./configure >&2 \
+    && make >&2 \
+    && make install >&2 \
+    && echo "SUCCESS: Tomcat Native-APR Library installed"
+
+ENV CATALINA_OPTS "-Djava.library.path=/usr/local/apr/lib"
+
 ################################################################
 # Retrieve, verify, and install the NGAP/OLFS web application
 #  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -

From 647e76231d2bdeca8f5236cd170c90567880c22e Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Wed, 20 Mar 2024 18:54:29 -0400
Subject: [PATCH 41/42] Remove Java-1.8 after Native APR library build

---
 hyrax-builds/ngap/Dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hyrax-builds/ngap/Dockerfile b/hyrax-builds/ngap/Dockerfile
index 74f1c8ff..414f7053 100644
--- a/hyrax-builds/ngap/Dockerfile
+++ b/hyrax-builds/ngap/Dockerfile
@@ -101,6 +101,9 @@ RUN set -e && dnf install -y make curl unzip which autoconf automake emacs vim
 RUN set -e && dnf install -y diffutils
 RUN set -e && dnf install -y procps
 RUN set -e && dnf install -y python3 git bc valgrind gdb
+# Temporary Hack to add Ant before we install Java-11 since it will install Java-8
+#RUN set -e && dnf install -y ant
+RUN set -e && dnf install -y java-11-openjdk
 RUN set -e && dnf install -y java-11-openjdk-devel
 # Temporary Hack to fix broken OpenJDK-11.0.20.0.8-2
 RUN set -e && dnf install -y tzdata-java
@@ -185,6 +188,10 @@ RUN set -e \
 
 ENV CATALINA_OPTS "-Djava.library.path=/usr/local/apr/lib"
 
+# Uninstall Java-1.8.0 installed by Ant
+RUN set -e && yum remove -y java-1.8.0-openjdk >&2
+RUN set -e && which java && java -version
+
 ################################################################
 # Retrieve, verify, and install the NGAP/OLFS web application
 #  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -

From 7d6b5186d582c6963660e5aa6bdf7d6ac8a01f82 Mon Sep 17 00:00:00 2001
From: dh-opendap <dholloway@opendap.org>
Date: Mon, 8 Apr 2024 12:51:32 -0400
Subject: [PATCH 42/42] Updated Ant installation

---
 hyrax-builds/ngap/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hyrax-builds/ngap/Dockerfile b/hyrax-builds/ngap/Dockerfile
index 414f7053..e55b088a 100644
--- a/hyrax-builds/ngap/Dockerfile
+++ b/hyrax-builds/ngap/Dockerfile
@@ -101,8 +101,6 @@ RUN set -e && dnf install -y make curl unzip which autoconf automake emacs vim
 RUN set -e && dnf install -y diffutils
 RUN set -e && dnf install -y procps
 RUN set -e && dnf install -y python3 git bc valgrind gdb
-# Temporary Hack to add Ant before we install Java-11 since it will install Java-8
-#RUN set -e && dnf install -y ant
 RUN set -e && dnf install -y java-11-openjdk
 RUN set -e && dnf install -y java-11-openjdk-devel
 # Temporary Hack to fix broken OpenJDK-11.0.20.0.8-2