From c9bdc7e01451968c4379d0d4014ce0567e4bc29b Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Tue, 17 Mar 2020 14:01:23 +0000
Subject: [PATCH] adding support for flags as per
 https://spaces.at.internet2.edu/display/Grouper/Grouper+packaging+and+versioning+strategy+for+2.5

---
 .../tier-support/supervisord-base.conf        | 15 +++++++++
 .../tier-support/supervisord-httpd.conf       |  6 ++++
 .../tier-support/supervisord-shibsp.conf      |  9 ++++++
 .../tier-support/supervisord-tomee.conf       | 31 -------------------
 4 files changed, 30 insertions(+), 31 deletions(-)
 create mode 100644 container_files/tier-support/supervisord-base.conf
 create mode 100644 container_files/tier-support/supervisord-httpd.conf
 create mode 100644 container_files/tier-support/supervisord-shibsp.conf

diff --git a/container_files/tier-support/supervisord-base.conf b/container_files/tier-support/supervisord-base.conf
new file mode 100644
index 00000000..fc02363b
--- /dev/null
+++ b/container_files/tier-support/supervisord-base.conf
@@ -0,0 +1,15 @@
+[supervisord]
+logfile=/tmp/logsuperd                               ; supervisord log file
+logfile_maxbytes=0                           ; maximum size of logfile before rotation
+loglevel=error                                  ; info, debug, warn, trace
+nodaemon=true                                  ; run supervisord as a daemon
+user=root                                       ; default user
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
+
+; Our processes
+; writing output to stdout (1) and err (2) (for Docker logging) and disabling log rotation
diff --git a/container_files/tier-support/supervisord-httpd.conf b/container_files/tier-support/supervisord-httpd.conf
new file mode 100644
index 00000000..592182d2
--- /dev/null
+++ b/container_files/tier-support/supervisord-httpd.conf
@@ -0,0 +1,6 @@
+[program:httpd]
+command=httpd -DFOREGROUND
+stderr_logfile = /tmp/loghttpd
+stderr_logfile_maxbytes=0
+stdout_logfile = /tmp/loghttpd
+stdout_logfile_maxbytes=0
diff --git a/container_files/tier-support/supervisord-shibsp.conf b/container_files/tier-support/supervisord-shibsp.conf
new file mode 100644
index 00000000..6ac0f0af
--- /dev/null
+++ b/container_files/tier-support/supervisord-shibsp.conf
@@ -0,0 +1,9 @@
+[program:shibbolethsp]
+user=shibd
+command=/usr/sbin/shibd -f -F
+stderr_logfile = /tmp/logshidb
+stderr_logfile_maxbytes=0
+stdout_logfile = /tmp/logshidb
+stdout_logfile_maxbytes=0
+
+
diff --git a/container_files/tier-support/supervisord-tomee.conf b/container_files/tier-support/supervisord-tomee.conf
index 63cfb278..215381f2 100644
--- a/container_files/tier-support/supervisord-tomee.conf
+++ b/container_files/tier-support/supervisord-tomee.conf
@@ -1,34 +1,3 @@
-[supervisord]
-logfile=/tmp/logsuperd                               ; supervisord log file
-logfile_maxbytes=0                           ; maximum size of logfile before rotation
-loglevel=error                                  ; info, debug, warn, trace
-nodaemon=true                                  ; run supervisord as a daemon
-user=root                                       ; default user
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
-
-; Our processes
-; writing output to stdout (1) and err (2) (for Docker logging) and disabling log rotation
-
-[program:httpd]
-command=httpd -DFOREGROUND
-stderr_logfile = /tmp/loghttpd
-stderr_logfile_maxbytes=0
-stdout_logfile = /tmp/loghttpd
-stdout_logfile_maxbytes=0
-
-[program:shibbolethsp]
-user=shibd
-command=/usr/sbin/shibd -f -F
-stderr_logfile = /tmp/logshidb
-stderr_logfile_maxbytes=0
-stdout_logfile = /tmp/logshidb
-stdout_logfile_maxbytes=0
-
 [program:tomee]
 user=tomcat
 command=/opt/tomee/bin/catalina.sh run