From d2465097ac6368eb75488a6c97b0b6293bd8feb5 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 15 May 2019 10:23:24 -0400 Subject: [PATCH 1/3] removing webapps/ROOT/ from container --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 716d44c9..a37e2a60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,7 +76,7 @@ RUN cd /opt/grouper/grouper.apiBinary/; \ RUN cd /opt/tomcat/; \ chmod +r bin/log4j-*.jar; \ - rm -fr webapps/docs/ webapps/examples/ webapps/host-manager/ webapps/manager/ logs/* temp/* work/* conf/logging.properties + rm -fr webapps/docs/ webapps/examples/ webapps/host-manager/ webapps/manager/ webapps/ROOT/ logs/* temp/* work/* conf/logging.properties RUN cd /opt/tomee/; \ chmod +r bin/log4j-*.jar; \ From c23674d7f82abac245155c0bfbcaa4e0e5affbaf Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 15 May 2019 10:24:09 -0400 Subject: [PATCH 2/3] Update grouper-www.conf --- container_files/httpd/grouper-www.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/container_files/httpd/grouper-www.conf b/container_files/httpd/grouper-www.conf index 368f7f6c..0108c5f8 100644 --- a/container_files/httpd/grouper-www.conf +++ b/container_files/httpd/grouper-www.conf @@ -7,6 +7,11 @@ ProxyPass /grouper ajp://localhost:8009/grouper timeout=2400 ProxyPass /grouper-ws ajp://localhost:8009/grouper-ws timeout=2400 ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper-ws-scim timeout=2400 +RewriteEngine on + +RewriteCond %{REQUEST_URI} "^/$" +RewriteRule . %{REQUEST_SCHEME}://%{HTTP_HOST}/grouper/ [R=301,L] + AuthType shibboleth ShibRequestSetting requireSession 1 From 04394718dd5d9d19f6320ad091d3ebe4b5ca37b2 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 15 May 2019 10:31:12 -0400 Subject: [PATCH 3/3] Update grouper-www.conf --- container_files/httpd/grouper-www.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/container_files/httpd/grouper-www.conf b/container_files/httpd/grouper-www.conf index 0108c5f8..562e47c6 100644 --- a/container_files/httpd/grouper-www.conf +++ b/container_files/httpd/grouper-www.conf @@ -8,7 +8,6 @@ ProxyPass /grouper-ws ajp://localhost:8009/grouper-ws timeout=2400 ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper-ws-scim timeout=2400 RewriteEngine on - RewriteCond %{REQUEST_URI} "^/$" RewriteRule . %{REQUEST_SCHEME}://%{HTTP_HOST}/grouper/ [R=301,L]