From 978999a2bbb3471b2df9270cec4172e4daa27aa5 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Wed, 27 Mar 2019 10:51:45 +0100
Subject: [PATCH] Do preliminary fixes for Shib3

---
 Dockerfile                                   | 9 +++------
 container_files/usr-local-bin/start-httpd.sh | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb52405..8158020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,7 @@ RUN yum -y install \
 	libcurl \
 	&& yum clean -y all
 
-RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem \
-    && cd /etc/httpd/conf.d/ \
+RUN cd /etc/httpd/conf.d/ \
     && rm -f autoindex.conf ssl.conf userdir.conf welcome.conf
 
 COPY container_files/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
@@ -38,8 +37,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 +46,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 +97,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..de05768 100755
--- a/container_files/usr-local-bin/start-httpd.sh
+++ b/container_files/usr-local-bin/start-httpd.sh
@@ -13,7 +13,7 @@ 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
+#ln -sf /etc/httpd/conf.modules.d/00-shib.conf.auth.$AUTHENTICATION /etc/httpd/conf.modules.d/00-shib.conf
 
 case $AUTHENTICATION in
   shibboleth)