From 3243b86f59188106af189ec73fb50e03eaa4962b Mon Sep 17 00:00:00 2001
From: Tom Downes <tpdownes@gmail.com>
Date: Mon, 10 Dec 2018 12:06:35 -0600
Subject: [PATCH] Add shibboleth DS CSS/JS to docker image

---
 Dockerfile                      | 1 +
 docker/supervisord-apache2.conf | 4 ++--
 docker/supervisord-shibd.conf   | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 docker/supervisord-shibd.conf

diff --git a/Dockerfile b/Dockerfile
index 6179de75e..3b9abd3ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,7 @@ RUN apt-get install --install-recommends --assume-yes \
 
 COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
 COPY docker/supervisord-apache2.conf /etc/supervisor/conf.d/apache2.conf
+COPY docker/shibboleth-ds /etc/shibboleth-ds
 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/inc-md-cert.pem /etc/shibboleth/inc-md-cert.pem
diff --git a/docker/supervisord-apache2.conf b/docker/supervisord-apache2.conf
index ef1d6c60d..7b85b430f 100644
--- a/docker/supervisord-apache2.conf
+++ b/docker/supervisord-apache2.conf
@@ -3,7 +3,7 @@ command=/usr/sbin/apache2ctl -DFOREGROUND
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
-priority=2
+priority=3
 
 [program:gracedb]
 command=/usr/local/bin/gunicorn --reload --bind 127.0.0.1:8080 config.wsgi:application
@@ -13,4 +13,4 @@ directory=/app/gracedb_project
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
-priority=1
+priority=2
diff --git a/docker/supervisord-shibd.conf b/docker/supervisord-shibd.conf
new file mode 100644
index 000000000..e950085b3
--- /dev/null
+++ b/docker/supervisord-shibd.conf
@@ -0,0 +1,8 @@
+[program:shibd]
+command=/usr/sbin/shibd -F
+user=_shibd
+group=_shibd
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+redirect_stderr=true
+priority=2
-- 
GitLab