Update to midPoint 4.2-SNAPSHOT

docker · Oct 19, 2020 · a4b0f8c · a4b0f8c
1 parent e52afeb
commit a4b0f8c
Show file tree

Hide file tree

Showing 7 changed files with 275 additions and 30 deletions.
diff --git a/container_files/httpd/conf/midpoint.conf b/container_files/httpd/conf/midpoint.conf
@@ -3,4 +3,4 @@ Timeout 2400
 ProxyTimeout 2400
 ProxyBadHeader Ignore
 
-ProxyPass /midpoint ajp://localhost:9090/midpoint  timeout=2400 retry=0
+ProxyPass /midpoint ajp://localhost:9090/midpoint secret=s3cr3t timeout=2400 retry=0
diff --git a/container_files/httpd/conf/midpoint.conf.auth.internal b/container_files/httpd/conf/midpoint.conf.auth.internal
@@ -3,4 +3,4 @@ Timeout 2400
 ProxyTimeout 2400
 ProxyBadHeader Ignore
 
-ProxyPass /midpoint ajp://localhost:9090/midpoint  timeout=2400 retry=0
+ProxyPass /midpoint ajp://localhost:9090/midpoint  secret=s3cr3t timeout=2400 retry=0
diff --git a/container_files/httpd/conf/midpoint.conf.auth.shibboleth b/container_files/httpd/conf/midpoint.conf.auth.shibboleth
@@ -3,7 +3,7 @@ Timeout 2400
 ProxyTimeout 2400
 ProxyBadHeader Ignore
 
-ProxyPass /midpoint ajp://localhost:9090/midpoint  timeout=2400 retry=0
+ProxyPass /midpoint ajp://localhost:9090/midpoint secret=s3cr3t timeout=2400 retry=0
 
 <Location /midpoint>
   AuthType shibboleth

diff --git a/container_files/usr-local-bin/start-midpoint.sh b/container_files/usr-local-bin/start-midpoint.sh
@@ -52,6 +52,7 @@ java -Xmx$MP_MEM_MAX -Xms$MP_MEM_INIT -Dfile.encoding=UTF8 \
        -Dspring.profiles.active="`$MP_DIR/active-spring-profiles`" \
        -Dserver.tomcat.ajp.enabled=$AJP_ENABLED \
        -Dserver.tomcat.ajp.port=$AJP_PORT \
+       -Dserver.tomcat.ajp.secret=s3cr3t \
        -Dlogging.path=/tmp/logtomcat \
        $MP_JAVA_OPTS \
        -jar $MP_DIR/lib/midpoint.war &>/tmp/logmidpoint-console
diff --git a/...erver/container_files/mp-home/post-initial-objects/securityPolicy/000-security-policy.xml b/...erver/container_files/mp-home/post-initial-objects/securityPolicy/000-security-policy.xml
@@ -70,7 +70,7 @@
                 Default GUI authentication sequence.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#user</channelId>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
                 <default>true</default>
                 <urlSuffix>gui-default</urlSuffix>
             </channel>
@@ -86,7 +86,7 @@
                 Special GUI authentication sequence that is using just the internal user password.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#user</channelId>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
                 <default>false</default>
                 <urlSuffix>emergency</urlSuffix>
             </channel>
@@ -104,7 +104,7 @@
                 Authentication sequence for REST service.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#rest</channelId>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
                 <default>true</default>
                 <urlSuffix>rest-default</urlSuffix>
             </channel>
@@ -120,7 +120,7 @@
                 Authentication sequence for actuator.
             </description>
             <channel>
-                <channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#actuator</channelId>
+                <channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
                 <default>true</default>
                 <urlSuffix>actuator-default</urlSuffix>
             </channel>

diff --git a/...iner_files/mp-home/post-initial-objects/systemConfigurations/010-system-configuration.xml b/...iner_files/mp-home/post-initial-objects/systemConfigurations/010-system-configuration.xml
diff --git a/download-midpoint.sh b/download-midpoint.sh
@@ -10,7 +10,7 @@ else
     # But if we need to incorporate interim changes to I2 distribution during
     # midPoint development cycle, we can specify concrete file from "midpoint-tier"
     # download directory by using its name (like "latest-stable").
-    MP_VERSION="4.1"
+    MP_VERSION="4.2-SNAPSHOT"
   else
     MP_VERSION=$tag
   fi