From 633ada5afb580dea9c755554c9a9a66b64434e4c Mon Sep 17 00:00:00 2001
From: Markus Krogh <markus@nordu.net>
Date: Wed, 27 Sep 2017 15:06:13 +0200
Subject: Structure cleanup + docker compose

---
 apache-sp/apache-conf/sp.conf | 2 ++
 apache-sp/entrypoint.sh       | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'apache-sp')

diff --git a/apache-sp/apache-conf/sp.conf b/apache-sp/apache-conf/sp.conf
index 5e32cbc..6678f8e 100644
--- a/apache-sp/apache-conf/sp.conf
+++ b/apache-sp/apache-conf/sp.conf
@@ -37,6 +37,8 @@ SSLHonorCipherOrder     on
         CustomLog /proc/self/fd/1 combined
         ServerSignature off
 
+        DirectoryIndex index.html index.shtml
+
 
         <Location /secure>
            AuthType shibboleth
diff --git a/apache-sp/entrypoint.sh b/apache-sp/entrypoint.sh
index 156b5ac..34589e3 100644
--- a/apache-sp/entrypoint.sh
+++ b/apache-sp/entrypoint.sh
@@ -29,7 +29,13 @@ if [ ! -f "$KEYDIR/private/${SP_HOSTNAME}.key" -o ! -f "$KEYDIR/certs/${SP_HOSTN
 fi
 
 # Fetch metadata
-curl http://shibboleth-docker:8080/idp/shibboleth -o /var/www/metadata.xml
+if [ -z "$SKIP_METADATA" ]; then
+  until curl http://shibboleth-docker:8080/idp/shibboleth -o /var/www/metadata.xml
+  do
+    sleep 5
+  done
+fi
+
 chown -R www-data:www-data /var/www/
 chmod -R a+r /var/www/
 
-- 
cgit v1.1