GRP-2899: installer does not install maturity level 0

docker · Jul 22, 2020 · b8c5e46 · b8c5e46
1 parent 380fd60
commit b8c5e46
Show file tree

Hide file tree

Showing 15 changed files with 610 additions and 219 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ RUN yum update -y \
 RUN yum install -y wget tar unzip dos2unix patch
 
 ARG GROUPER_CONTAINER_VERSION
-ENV GROUPER_VERSION=2.5.32 \
+ENV GROUPER_VERSION=2.5.33 \
      GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
 
 # Install Corretto Java JDK
@@ -32,7 +32,7 @@ RUN echo 'Installing Grouper'; \
     cd /opt/grouper/$GROUPER_VERSION/ \
     && $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller
 FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.5.32 \
+ENV GROUPER_VERSION=2.5.33 \
     TOMEE_VERSION=7.0.0
 RUN mkdir -p /opt/grouper/grouperWebapp/
 RUN mkdir -p /opt/tomee/

diff --git a/container_files/tier-support/test/grouperContainerUnitTest.sh b/container_files/tier-support/test/grouperContainerUnitTest.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 4 ]; then
   exit 1
 fi
 
-expectedSuccesses=537
+expectedSuccesses=538
 
 export containerName=$1
 export imageName=$2

diff --git a/container_files/tier-support/test/grouperContainerUnitTestUi.sh b/container_files/tier-support/test/grouperContainerUnitTestUi.sh
@@ -56,6 +56,8 @@ testContainerUi() {
 
   assertFileNotContains /opt/tomee/conf/server.xml "AccessLogValve"
 
+  assertFileContains /opt/tomee/conf/server.xml "tomcatAuthentication"
+
   assertEnvVarNot GROUPER_APACHE_SERVER_NAME https://a.b.c:443
   assertEnvVar GROUPER_TOMCAT_LOG_ACCESS "false"
   assertEnvVar GROUPERSCIM_PROXY_PASS "#"

diff --git a/container_files/tomee/conf/server.xml.loggingpipe b/container_files/tomee/conf/server.xml.loggingpipe
@@ -115,7 +115,7 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" />
+    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" />
 
 
     <!-- An Engine represents the entry point (within Catalina) that processes
@@ -159,9 +159,10 @@
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
              Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-               directory="/tmp" prefix="tomcat_access_log"
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="/tmp"
+               prefix="tomcat_access_log"
                rotatable="false" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
       </Host>
     </Engine>
   </Service>

diff --git a/container_files/tomee/conf/server.xml.loggingpipe.patch b/container_files/tomee/conf/server.xml.loggingpipe.patch
@@ -1,12 +1,15 @@
---- server.xml	2020-05-18 15:49:21.192827000 +0000
-+++ server.xml.loggingpipe	2020-05-18 15:52:04.068293000 +0000
-@@ -159,6 +159,9 @@
+--- server.xml.turnOnAjp	2020-07-21 22:01:04.000000000 -0400
++++ server.xml.loggingpipe	2020-07-21 21:59:08.000000000 -0400
+@@ -159,9 +159,9 @@
          <!-- Access log processes all example.
               Documentation at: /docs/config/valve.html
               Note: The pattern used is equivalent to using pattern="common" -->
-+        <Valve className="org.apache.catalina.valves.AccessLogValve"
-+               directory="/tmp" prefix="tomcat_access_log"
+-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+-               prefix="localhost_access_log" suffix=".txt"
+-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
++        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="/tmp"
++               prefix="tomcat_access_log"
 +               rotatable="false" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
        </Host>
      </Engine>
-   </Service>
diff --git a/container_files/tomee/conf/server.xml.nologging b/container_files/tomee/conf/server.xml.nologging
@@ -115,7 +115,7 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" />
+    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" />
 
 
     <!-- An Engine represents the entry point (within Catalina) that processes
@@ -159,6 +159,10 @@
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html
              Note: The pattern used is equivalent to using pattern="common" -->
+
+
+
+
       </Host>
     </Engine>
   </Service>

diff --git a/container_files/tomee/conf/server.xml.nologging.patch b/container_files/tomee/conf/server.xml.nologging.patch
@@ -1,13 +1,15 @@
---- server.xml	2020-05-13 19:09:12.000000000 +0000
-+++ server.xml.nologging	2020-05-17 15:36:47.361138000 +0000
-@@ -159,10 +159,6 @@
+--- server.xml.turnOnAjp	2020-07-21 22:01:04.000000000 -0400
++++ server.xml.nologging	2020-07-21 21:59:26.000000000 -0400
+@@ -159,9 +159,9 @@
          <!-- Access log processes all example.
               Documentation at: /docs/config/valve.html
               Note: The pattern used is equivalent to using pattern="common" -->
 -        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
 -               prefix="localhost_access_log" suffix=".txt"
 -               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
--
++
++
++
+
        </Host>
      </Engine>
-   </Service>