From 874e5603d5aab9ea56e3ef396ec9f0cbeee75db7 Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Tue, 17 Mar 2020 14:07:21 +0000
Subject: [PATCH] update path for supervisord

---
 container_files/usr-local-bin/library.sh | 20 ++++++++++++++++++++
 container_files/usr-local-bin/scim       |  2 +-
 container_files/usr-local-bin/ui         |  2 +-
 container_files/usr-local-bin/ui-ws      |  2 +-
 container_files/usr-local-bin/ws         |  2 +-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
index c1a1f224..96eb6ddc 100755
--- a/container_files/usr-local-bin/library.sh
+++ b/container_files/usr-local-bin/library.sh
@@ -168,3 +168,23 @@ prepConf() {
     prepUIConf
     prepWSConf
 }
+
+if [ "$RUN_APACHE" = "true" ]
+  then
+    cat /opt/tier-support/supervisord-httpd.conf >> /opt/tier-support/supervisord-base.conf
+fi
+
+
+if [ "$RUN_TOMEE" = "true" ]
+  then
+    cat /opt/tier-support/supervisord-tomee.conf >> /opt/tier-support/supervisord-base.conf
+fi
+
+if [ "$RUN_SHIB_SP" = "true" ]
+  then
+    cat /opt/tier-support/supervisord-shibsp.conf >> /opt/tier-support/supervisord-base.conf
+fi
+
+
+cat /opt/tier-support/supervisord-base.conf > /opt/tier-support/supervisord.conf
+
diff --git a/container_files/usr-local-bin/scim b/container_files/usr-local-bin/scim
index ffe12b37..9ab7c7b4 100755
--- a/container_files/usr-local-bin/scim
+++ b/container_files/usr-local-bin/scim
@@ -4,4 +4,4 @@
 
 prepSCIM
 
-exec /usr/bin/supervisord -c /opt/tier-support/supervisord-tomee.conf
+exec /usr/bin/supervisord -c /opt/tier-support/supervisord.conf
diff --git a/container_files/usr-local-bin/ui b/container_files/usr-local-bin/ui
index dee276bd..59994da0 100755
--- a/container_files/usr-local-bin/ui
+++ b/container_files/usr-local-bin/ui
@@ -6,4 +6,4 @@ prepUI
 
 export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
 
-exec /usr/bin/supervisord -c /opt/tier-support/supervisord-tomee.conf
+exec /usr/bin/supervisord -c /opt/tier-support/supervisord.conf
diff --git a/container_files/usr-local-bin/ui-ws b/container_files/usr-local-bin/ui-ws
index 5c78d720..3eee072e 100755
--- a/container_files/usr-local-bin/ui-ws
+++ b/container_files/usr-local-bin/ui-ws
@@ -7,4 +7,4 @@ prepWS
 
 export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
 
-exec /usr/bin/supervisord -c /opt/tier-support/supervisord-tomee.conf
+exec /usr/bin/supervisord -c /opt/tier-support/supervisord.conf
diff --git a/container_files/usr-local-bin/ws b/container_files/usr-local-bin/ws
index 2cad6dbd..99f893ee 100755
--- a/container_files/usr-local-bin/ws
+++ b/container_files/usr-local-bin/ws
@@ -4,4 +4,4 @@
 
 prepWS
 
-exec /usr/bin/supervisord -c /opt/tier-support/supervisord-tomee.conf
+exec /usr/bin/supervisord -c /opt/tier-support/supervisord.conf