diff options
| author | Markus Krogh <markus@nordu.net> | 2017-09-27 15:06:13 +0200 |
|---|---|---|
| committer | Markus Krogh <markus@nordu.net> | 2017-09-27 15:06:13 +0200 |
| commit | 633ada5afb580dea9c755554c9a9a66b64434e4c (patch) | |
| tree | 0fab0e66eada4201009edbd6bc3bafd083b6ed97 /apache-sp | |
| parent | 489b5dcdaa79180ba6c9004332a4520717c27361 (diff) | |
Structure cleanup + docker compose
Diffstat (limited to 'apache-sp')
| -rw-r--r-- | apache-sp/apache-conf/sp.conf | 2 | ||||
| -rw-r--r-- | apache-sp/entrypoint.sh | 8 |
2 files changed, 9 insertions, 1 deletions
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/ |