diff --git a/Dockerfile b/Dockerfile
index 8158020..94bcac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,8 @@ RUN yum -y install \
libcurl \
&& yum clean -y all
-RUN cd /etc/httpd/conf.d/ \
+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
COPY container_files/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
diff --git a/Jenkinsfile b/Jenkinsfile
index 65c7751..688c9d2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
sh 'echo Docker containers before compositions tests ; docker ps -a' // temporary
sh '(cd demo/simple ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
- // sh '(cd demo/shibboleth ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
+ sh '(cd demo/shibboleth ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
sh '(cd demo/postgresql ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
// sh '(cd demo/complex ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
} catch (error) {
diff --git a/container_files/usr-local-bin/start-httpd.sh b/container_files/usr-local-bin/start-httpd.sh
index de05768..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/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 @@
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+