GRP-2773: add variable for logout page in container

docker · May 8, 2020 · 2a06368 · 2a06368
1 parent 8ba39b2
commit 2a06368
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 312 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -49,7 +49,6 @@ RUN ls /opt/grouper/grouperWebapp/WEB-INF
 RUN cd /opt/tomee/; \
     rm -fr webapps/docs/ webapps/host-manager/ webapps/manager/ logs/* temp/* work/* conf/logging.properties
 COPY container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/
-COPY container_files/ui/ /opt/grouper/grouperWebapp/WEB-INF/classes/
 COPY container_files/tomee/ /opt/tomee/
 
 FROM tier/shibboleth_sp:3.1.0_04172020

diff --git a/container_files/api/log4j.properties b/container_files/api/log4j.properties
@@ -31,14 +31,14 @@ log4j.appender.grouper_event                            = org.apache.log4j.FileA
 log4j.appender.grouper_event.file                       = /tmp/logpipe
 log4j.appender.grouper_event.append                     = true
 log4j.appender.grouper_event.layout                     = org.apache.log4j.PatternLayout
-log4j.appender.grouper_event.layout.ConversionPattern   = grouper-api;grouper_event.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
+log4j.appender.grouper_event.layout.ConversionPattern   = __GROUPER_LOG_PREFIX__;grouper_event.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
 
 ## Grouper API error logging
 log4j.appender.grouper_error                            = org.apache.log4j.FileAppender
 log4j.appender.grouper_error.file                       = /tmp/logpipe
 log4j.appender.grouper_errot.append                     = true
 log4j.appender.grouper_error.layout                     = org.apache.log4j.PatternLayout
-log4j.appender.grouper_error.layout.ConversionPattern   = grouper-api;grouper_error.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
+log4j.appender.grouper_error.layout.ConversionPattern   = __GROUPER_LOG_PREFIX__;grouper_error.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
 #log4j.appender.grouper_error.layout.ConversionPattern   = %d{ISO8601}: %m%n
 
 # Debug logging (Or: logging that I haven't cleaned up yet to send elsewhere)
@@ -47,15 +47,15 @@ log4j.appender.grouper_debug.file                       = /tmp/logpipe
 log4j.appender.grouper_debug.append                     = true
 log4j.appender.grouper_debug.layout                     = org.apache.log4j.PatternLayout
 #log4j.appender.grouper_debug.layout.ConversionPattern   = %d{ISO8601} %5p %c{2}: %m%n
-log4j.appender.grouper_debug.layout.ConversionPattern   = grouper-api;grouper_debug.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
+log4j.appender.grouper_debug.layout.ConversionPattern   = __GROUPER_LOG_PREFIX__;grouper_debug.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
 
 ## Benchmark logging
 log4j.appender.grouper_gb                               = org.apache.log4j.FileAppender
 log4j.appender.grouper_gb.file                          = /tmp/logpipe
 log4j.appender.grouper_gb.append                        = true
 log4j.appender.grouper_gb.layout                        = org.apache.log4j.PatternLayout
 #log4j.appender.grouper_gb.layout.ConversionPattern      = %d{ISO8601} %5p %c{2}: %m%n
-log4j.appender.grouper_gb.layout.ConversionPattern      = grouper-api;grouper_bench.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
+log4j.appender.grouper_gb.layout.ConversionPattern      = __GROUPER_LOG_PREFIX__;grouper_bench.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
 
 # Loggers
 

diff --git a/container_files/ui/classes/grouper-ui.properties b/container_files/ui/classes/grouper-ui.properties
diff --git a/container_files/ui/classes/log4j.properties b/container_files/ui/classes/log4j.properties
diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
@@ -127,6 +127,19 @@ prepConf() {
     linkGrouperSecrets $dest/classes
 }
 
+prepUIonly() {
+   if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-ui; fi
+}
+prepWSonly() {
+   if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-ws; fi
+}
+prepSCIMonly() {
+   if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-scim; fi
+}
+prepDaemonOnly() {
+   if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper-daemon; fi
+}
+
 tomeeContextGrouperForUiOrAll() {
    # allow all grouper contexts to run
    rm /opt/tomee/conf/Catalina/localhost/grouper-ws.xml
@@ -204,13 +217,6 @@ finishPrep() {
         cp /opt/grouper/grouperWebapp/WEB-INF/server.wsTomcatAuthn.xml /opt/tomee/conf/server.xml
     fi
 
-    # do this last
-    if [ "$GROUPER_CHOWN_DIRS" = "true" ]
-      then
-        chown -R tomcat:tomcat /opt/grouper/grouperWebapp
-    fi
-
-
     # construct the supervisord file based on FLAGS passed in or what was in CMD
 
     if [ "$RUN_HSQLDB" = "true" ]
@@ -244,6 +250,7 @@ finishPrep() {
         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
+        if [ -z "$GROUPERUI_LOGOUT_REDIRECTTOURL" ]; then export GROUPERUI_LOGOUT_REDIRECTTOURL=/Shibboleth.sso/Logout; fi
     fi
 
     # copy files to their appropriate locations based on passed in flags
@@ -303,6 +310,29 @@ finishPrep() {
          fi
 
     fi
+
+    if [ "$GROUPER_WS" = "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" != "true" ]
+       then
+         prepWSonly
+    fi
+
+    if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" = "true" ] && [ "$GROUPER_DAEMON" != "true" ]
+       then
+         prepSCIMonly
+    fi
+
+    if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" = "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" != "true" ]
+       then
+         prepUIonly
+    fi
+
+    if [ "$GROUPER_WS" != "true" ] && [ "$GROUPER_UI" != "true" ] && [ "$GROUPER_SCIM" != "true" ] && [ "$GROUPER_DAEMON" = "true" ]
+      then
+        prepDaemonOnly
+    else 
+
+    if [ -z "$GROUPER_LOG_PREFIX" ]; then export GROUPER_LOG_PREFIX=grouper; fi
+    sed -i "s|__GROUPER_PROXY_PASS__|$GROUPER_LOG_PREFIX|g" /etc/httpd/conf.d/grouper-www.conf
 
     if [ "$SELF_SIGNED_CERT" = "true" ]
        then
@@ -314,5 +344,11 @@ finishPrep() {
           export GROUPER_MAX_MEMORY=1500m
     fi
 
+    # do this last
+    if [ "$GROUPER_CHOWN_DIRS" = "true" ]
+      then
+        chown -R tomcat:tomcat /opt/grouper/grouperWebapp
+    fi
+
 
 }