From bd9a3971b424374f957fcda3c9eb96c3f01b6877 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Fri, 28 Oct 2022 16:25:27 -0400
Subject: [PATCH] tomcat rewrite for oidc

---
 testbed/integration/shibboleth-idp/Dockerfile                | 2 +-
 testbed/integration/shibboleth-idp/config/tomcat/context.xml | 1 -
 testbed/integration/shibboleth-idp/config/tomcat/server.xml  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbed/integration/shibboleth-idp/Dockerfile b/testbed/integration/shibboleth-idp/Dockerfile
index e4a2ae236..a625c07e8 100644
--- a/testbed/integration/shibboleth-idp/Dockerfile
+++ b/testbed/integration/shibboleth-idp/Dockerfile
@@ -31,6 +31,6 @@ ADD ${SHBCFG} /opt/shibboleth-idp/conf
 #ADD ${SHBMSGS} /opt/shibboleth-idp/messages
 ADD ${SHBMD} /opt/shibboleth-idp/metadata
 ADD ${OIDCREG} /opt/shibboleth-idp/static
-ADD ${TOMREWRITE} /opt/shibboleth-idp/edit-webapp/WEB-INF/rewrite.config
+ADD ${TOMREWRITE} /usr/local/tomcat/conf/Catalina/localhost/rewrite.config
 
 EXPOSE 8080
diff --git a/testbed/integration/shibboleth-idp/config/tomcat/context.xml b/testbed/integration/shibboleth-idp/config/tomcat/context.xml
index 0bba305ef..98727cb7b 100644
--- a/testbed/integration/shibboleth-idp/config/tomcat/context.xml
+++ b/testbed/integration/shibboleth-idp/config/tomcat/context.xml
@@ -20,7 +20,6 @@
 
     <!-- Default set of monitored resources. If one of these changes, the    -->
     <!-- web application will be reloaded.                                   -->
-    <Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />
     <WatchedResource>WEB-INF/web.xml</WatchedResource>
     <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
 
diff --git a/testbed/integration/shibboleth-idp/config/tomcat/server.xml b/testbed/integration/shibboleth-idp/config/tomcat/server.xml
index de89b5842..2b4b8ebfa 100644
--- a/testbed/integration/shibboleth-idp/config/tomcat/server.xml
+++ b/testbed/integration/shibboleth-idp/config/tomcat/server.xml
@@ -12,6 +12,7 @@
       <Host name="localhost"  appBase="webapps"
             unpackWARs="true" autoDeploy="true">
 
+        <Valve className="org.apache.catalina.valves.rewrite.RewriteValve" />
         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
                prefix="localhost_access_log." suffix=".txt"
                pattern="%h %l %u %t &quot;%r&quot; %s %b" />