feat(incommon): proxy pass DiscoFeed

uc-cdis · Jun 26, 2019 · 6d7b83f · 6d7b83f
1 parent d954728
commit 6d7b83f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/DockerfileShib b/DockerfileShib
@@ -64,6 +64,9 @@ RUN ln -s /fence/wsgi.py /var/www/fence/wsgi.py \
         require shibboleth\n\
       </IfModule>\n\
     </Location>\n\
+    <Location /Shibboleth.sso/DiscoFeed>\n\
+      ProxyPass "SHIBBOLETH_PROVIDER/Shibboleth.sso/DiscoFeed" timeout=5\n\
+    </Location>\n\
     ErrorLog ${APACHE_LOG_DIR}/error.log\n\
     LogLevel info\n\
     LogFormat "%{X-Forwarded-For}i %l %{X-UserId}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" aws\n\

diff --git a/dockerrunshib.bash b/dockerrunshib.bash
@@ -20,5 +20,6 @@ if [ -f /fence/jwt-keys.tar ]; then
 fi
 service shibd start
 sed -i "s/ServerName SERVERNAME/ServerName https:\/\/$HOSTNAME/g" /etc/apache2/sites-available/fence.conf
+sed -i "s/SHIBBOLETH_PROVIDER/$SHIBBOLETH_PROVIDER/g" /etc/apache2/sites-available/fence.conf
 rm -rf /var/run/apache2/apache2.pid
 /usr/sbin/apache2ctl -D FOREGROUND