diff --git a/Dockerfile b/Dockerfile
index cb52405..94bcac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN yum -y install \
libcurl \
&& yum clean -y all
-RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem \
+RUN rm /etc/shibboleth/sp-signing-key.pem /etc/shibboleth/sp-signing-cert.pem /etc/shibboleth/sp-encrypt-key.pem /etc/shibboleth/sp-encrypt-cert.pem\
&& cd /etc/httpd/conf.d/ \
&& rm -f autoindex.conf ssl.conf userdir.conf welcome.conf
@@ -38,8 +38,6 @@ RUN chmod 755 /opt/tier/setenv.sh \
RUN cp /dev/null /etc/httpd/conf.d/ssl.conf \
&& mv /etc/httpd/conf.d/shib.conf /etc/httpd/conf.d/shib.conf.auth.shibboleth \
&& touch /etc/httpd/conf.d/shib.conf.auth.internal \
- && mv /etc/httpd/conf.modules.d/00-shib.conf /etc/httpd/conf.modules.d/00-shib.conf.auth.shibboleth \
- && touch /etc/httpd/conf.modules.d/00-shib.conf.auth.internal \
&& sed -i 's/LogFormat "/LogFormat "httpd;access_log;%{ENV}e;%{USERTOKEN}e;/g' /etc/httpd/conf/httpd.conf \
&& echo -e "\nErrorLogFormat \"httpd;error_log;%{ENV}e;%{USERTOKEN}e;[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i\"" >> /etc/httpd/conf/httpd.conf \
&& sed -i 's/CustomLog "logs\/access_log"/CustomLog "\/tmp\/loghttpd"/g' /etc/httpd/conf/httpd.conf \
@@ -49,7 +47,7 @@ RUN cp /dev/null /etc/httpd/conf.d/ssl.conf \
# Build arguments
-ARG MP_VERSION=3.9
+ARG MP_VERSION=4.0
ARG MP_DIST_FILE=midpoint-dist.tar.gz
ENV MP_DIR /opt/midpoint
@@ -100,7 +98,7 @@ ENV TIER_MAINTAINER tier
# TIER Beacon Opt-out
# Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2.
-# With the default/release configuration, it will only send product (Shibb/Grouper/COmanage/midPoint) and version (3.9, etc)
+# With the default/release configuration, it will only send product (Shibb/Grouper/COmanage/midPoint) and version (4.0, etc)
# once daily between midnight and 4am. There is no configuration or private information collected or sent.
# This data helps with the scaling and funding of TIER. Please do not disable it if you find the TIER tools useful.
# To keep it commented, keep multiple comments on the following line (to prevent other scripts from processing it).
diff --git a/container_files/usr-local-bin/start-httpd.sh b/container_files/usr-local-bin/start-httpd.sh
index 96ad214..7d002cd 100755
--- a/container_files/usr-local-bin/start-httpd.sh
+++ b/container_files/usr-local-bin/start-httpd.sh
@@ -3,8 +3,10 @@
echo "Linking secrets"
for filepath in /run/secrets/*; do
label_file=`basename $filepath`
- if [ "$label_file" == "mp_sp-key.pem" ]; then
- ln -sf /run/secrets/mp_sp-key.pem /etc/shibboleth/sp-key.pem
+ if [ "$label_file" == "mp_sp-signing-key.pem" ]; then
+ ln -sf /run/secrets/mp_sp-key.pem /etc/shibboleth/sp-signing-key.pem
+ elif [ "$label_file" == "mp_sp-encrypt-key.pem" ]; then
+ ln -sf /run/secrets/mp_sp-key.pem /etc/shibboleth/sp-encrypt-key.pem
elif [ "$label_file" == "mp_host-key.pem" ]; then
ln -sf /run/secrets/mp_host-key.pem /etc/pki/tls/private/host-key.pem
fi
@@ -13,12 +15,13 @@ done
echo "Linking config files; using authentication: $AUTHENTICATION"
ln -sf /etc/httpd/conf.d/midpoint.conf.auth.$AUTHENTICATION /etc/httpd/conf.d/midpoint.conf
ln -sf /etc/httpd/conf.d/shib.conf.auth.$AUTHENTICATION /etc/httpd/conf.d/shib.conf
-ln -sf /etc/httpd/conf.modules.d/00-shib.conf.auth.$AUTHENTICATION /etc/httpd/conf.modules.d/00-shib.conf
case $AUTHENTICATION in
shibboleth)
echo "*** Starting httpd WITH Shibboleth support"
- httpd-shib-foreground
+ set -e
+ rm -f /etc/httpd/logs/httpd.pid
+ (/usr/sbin/shibd) & httpd -DFOREGROUND
;;
internal)
echo "*** Starting httpd WITHOUT Shibboleth support"
diff --git a/demo/complex/after-installation.sh b/demo/complex/after-installation.sh
index 1629455..68582e3 100755
--- a/demo/complex/after-installation.sh
+++ b/demo/complex/after-installation.sh
@@ -12,6 +12,9 @@ $(dirname "$0")/test-resources-1.sh
echo -e "${B} * Recomputing Grouper admin group and user object...${N}"
$(dirname "$0")/recompute.sh
+echo -e "${B} * Waiting 120 seconds for changes to propagate to Grouper...${N}"
+sleep 120
+
echo -e "${B} * Testing Grouper resource...${N}"
$(dirname "$0")/test-resource-grouper.sh
diff --git a/demo/complex/configs-and-secrets/midpoint/shibboleth/shibboleth2.xml b/demo/complex/configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
index a644264..ee05a97 100644
--- a/demo/complex/configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
+++ b/demo/complex/configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
@@ -110,8 +110,11 @@
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+