diff options
| author | Jesper Brix Rosenkilde <jbr@nordu.net> | 2017-07-07 15:24:21 +0200 |
|---|---|---|
| committer | Jesper Brix Rosenkilde <jbr@nordu.net> | 2017-07-07 15:24:21 +0200 |
| commit | cef764eca8d826b246f026861d44653aabdd3da9 (patch) | |
| tree | 185a9a10beb5c7b6ca24d4b43dde90bbb0deb66f /apache-sp/entrypoint.sh | |
| parent | 6f4cfe32c9513dda74829217f272d98a936b62fe (diff) | |
Make metadata available before shibd is started
Diffstat (limited to 'apache-sp/entrypoint.sh')
| -rw-r--r-- | apache-sp/entrypoint.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apache-sp/entrypoint.sh b/apache-sp/entrypoint.sh index 30714c4..dc16803 100644 --- a/apache-sp/entrypoint.sh +++ b/apache-sp/entrypoint.sh @@ -14,6 +14,10 @@ if [ ! -f "$KEYDIR/private/${SP_HOSTNAME}.key" -o ! -f "$KEYDIR/certs/${SP_HOSTN cp /etc/ssl/certs/ssl-cert-snakeoil.pem "$KEYDIR/certs/${SP_HOSTNAME}.crt" fi +# Fetch metadata +curl http://shibboleth-docker:8080/idp/shibboleth -o /var/www/metadata.xml +chown -R www-data:www-data /var/www/ +chmod -R a+r /var/www/ # Setup shibd sed -i -e "s/__SP_HOSTNAME__/$SP_HOSTNAME/g" -e "s%__KEYDIR__%$KEYDIR%g" /etc/shibboleth/shibboleth2.xml @@ -34,7 +38,4 @@ a2ensite sp service shibd start rm -f /var/run/apache2/apache2.pid -curl http://idp.nordu.dev/idp/shibboleth -o /var/www/metadata.xml -chown www-data:www-data /var/www/metadata.xml && chmod a+r /var/www/metadata.xml - env APACHE_LOCK_DIR=/var/lock/apache2 APACHE_RUN_DIR=/var/run/apache2 APACHE_PID_FILE=/var/run/apache2/apache2.pid APACHE_RUN_USER=www-data APACHE_RUN_GROUP=www-data APACHE_LOG_DIR=/var/log/apache2 apache2 -DFOREGROUND |