Maintenance will be performed on git.ligo.org, chat.ligo.org, containers.ligo.org, and docs.ligo.org on Tuesday 19th January 2021 starting at approximately 8am MST. It is expected to take around 15 minutes and there will be a short period of downtime towards the end of the maintenance window. Please direct and comments, questions, or concerns to computing-help@igwn.org.

Verified Commit 3c61e44c authored by Thomas Downes's avatar Thomas Downes Committed by Tanner Prestegard

Add supervisor configuration to launch shibboleth SP daemon only when

ENABLE_SHIBD environment variable is set to "true" (default="false")
parent 88ca7348
...@@ -35,6 +35,7 @@ RUN apt-get install --install-recommends --assume-yes \ ...@@ -35,6 +35,7 @@ RUN apt-get install --install-recommends --assume-yes \
COPY docker/supervisord.conf /etc/supervisor/supervisord.conf COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
COPY docker/supervisord-apache2.conf /etc/supervisor/conf.d/apache2.conf COPY docker/supervisord-apache2.conf /etc/supervisor/conf.d/apache2.conf
COPY docker/supervisord-shibd.conf /etc/supervisor/conf.d/shibd.conf
COPY docker/shibboleth-ds /etc/shibboleth-ds COPY docker/shibboleth-ds /etc/shibboleth-ds
COPY docker/apache-config /etc/apache2/sites-available/gracedb.conf COPY docker/apache-config /etc/apache2/sites-available/gracedb.conf
COPY docker/login.ligo.org.cert.LIGOCA.pem /etc/shibboleth/login.ligo.org.cert.LIGOCA.pem COPY docker/login.ligo.org.cert.LIGOCA.pem /etc/shibboleth/login.ligo.org.cert.LIGOCA.pem
...@@ -56,6 +57,7 @@ RUN pip install --upgrade setuptools wheel && \ ...@@ -56,6 +57,7 @@ RUN pip install --upgrade setuptools wheel && \
# Give pip-installed packages priority over distribution packages # Give pip-installed packages priority over distribution packages
ENV PYTHONPATH /usr/local/lib/python2.7/dist-packages:$PYTHONPATH ENV PYTHONPATH /usr/local/lib/python2.7/dist-packages:$PYTHONPATH
ENV ENABLE_SHIBD false
ENV VIRTUAL_ENV dummy ENV VIRTUAL_ENV dummy
# Expose port and run Gunicorn # Expose port and run Gunicorn
......
[program:shibd] [program:shibd]
autostart=%(ENV_ENABLE_SHIBD)s
command=/usr/sbin/shibd -F command=/usr/sbin/shibd -F
user=_shibd user=_shibd
group=_shibd group=_shibd
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment