GRP-2733: shibd.conf should only be in shib enabled containers

docker · May 2, 2020 · ca72b5b · ca72b5b
1 parent 89000fb
commit ca72b5b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
@@ -147,11 +147,13 @@ finishPrep() {
       then
         cat /opt/tier-support/supervisord-tomee.conf >> /opt/tier-support/supervisord.conf
     fi
-
+
+    mv /etc/httpd/conf.d/shib.conf /etc/httpd/conf.d/shib.conf.dontuse
     if [ "$RUN_SHIB_SP" = "true" ]
       then
         cat /opt/tier-support/supervisord-shibsp.conf >> /opt/tier-support/supervisord.conf
         cp /opt/tier-support/httpd-shib.conf /etc/httpd/conf.d/
+        mv /etc/httpd/conf.d/shib.conf.dontuse /etc/httpd/conf.d/shib.conf
     fi
 
     # copy files to their appropriate locations based on passed in flags