From f5bcdcddeb17cc1d6266fb8dd71def92443aec4a Mon Sep 17 00:00:00 2001
From: Torben Brenner <t.brenner@dkfz-heidelberg.de>
Date: Tue, 7 Sep 2021 14:20:08 +0200
Subject: [PATCH] refactor: Removed TOMCAT_REVERSEPROXY variables

DEPLOYMENT_CONTEXT and SHARE_URL should be enough
---
 Dockerfile                           |  4 +---
 docs/deployment/docker-deployment.md |  2 --
 src/docker/server.reverseproxy.patch | 26 ------------------------
 src/docker/start.sh                  | 30 ----------------------------
 4 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 src/docker/server.reverseproxy.patch

diff --git a/Dockerfile b/Dockerfile
index 8bca7ae6..d3fc6dff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,12 +20,10 @@ RUN ["rm", "-fr", "/usr/local/tomcat/webapps"]
 COPY --from=extract /connector/extracted/ /usr/local/tomcat/webapps/ROOT/
 
 # Adding fontconfig and libfreetype6 for rendering the BK Export, cf. https://stackoverflow.com/questions/55454036
-# Patch is needed for reverse proxy configuration
-RUN	apt-get update && apt-get install -y fontconfig libfreetype6 patch && \
+RUN	apt-get update && apt-get install -y fontconfig libfreetype6 && \
     rm -rf /var/lib/apt/lists/*
 
 ADD src/docker/context.xml                      ${CATALINA_HOME}/conf/Catalina/localhost/ROOT.xml
-ADD src/docker/server.reverseproxy.patch        ${CATALINA_HOME}/conf/server.reverseproxy.patch
 
 ADD src/docker/samply_common_urls.xml           ${CATALINA_HOME}/conf/${PROJECT}_common_urls.xml
 ADD src/docker/samply_common_operator.xml       ${CATALINA_HOME}/conf/${PROJECT}_common_operator.xml
diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md
index 5d301cba..c78bed6e 100644
--- a/docs/deployment/docker-deployment.md
+++ b/docs/deployment/docker-deployment.md
@@ -79,8 +79,6 @@ If postgres connection errors occur, try your ip for POSTGRES_HOST. For all Envi
 | feature_DKTK_CENTRAL_SEARCH   |   false | Feature toggle for the DKTK central search     |
 | feature_NNGM_CTS              |   false | Feature toggle for the NNGM CTS                | 
 | CATALINA_OPTS  |         | JVM options                                                   |
-| TOMCAT_REVERSEPROXY_FQDN |          | The FQDN of share-client then run behind a reverse proxy. See [Tomcat Connector](https://tomcat.apache.org/tomcat-8.5-doc/config/http.html) "proxyName" for more information.|
-| TOMCAT_REVERSEPROXY_SSL |          | Whether the reverse proxy is running SSL or not. Set either to true or false. Automatically configures [Tomcat Connector](https://tomcat.apache.org/tomcat-8.5-doc/config/http.html) "proxyPort", "scheme" and "secure".|
 | DEPLOYMENT_CONTEXT |          | The subpath of the bridgehead installation. Normally bridgehead will be deployed to ROOT, but with this variable you can change it for example to "connector". It is not possible to pass multiple subdirectories like "connector/samply".|
 
 *necessary
diff --git a/src/docker/server.reverseproxy.patch b/src/docker/server.reverseproxy.patch
deleted file mode 100644
index ca68e3b3..00000000
--- a/src/docker/server.reverseproxy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tomcat/config/server.xml	2020-04-24 12:45:09.996222000 +0200
-+++ tomcat/config/server.docker.xml	2020-04-24 12:43:55.362172600 +0200
-@@ -68,7 +68,11 @@
-     -->
-     <Connector port="8080" protocol="HTTP/1.1"
-                connectionTimeout="20000"
--               redirectPort="8443" />
-+               redirectPort="8443"
-+               proxyName="{tomcat_reverseproxy_fqdn}"
-+               proxyPort="{tomcat_reverseproxy_port}"
-+               scheme="{tomcat_reverseproxy_scheme}"
-+               secure="{tomcat_reverseproxy_ssl}" />
-     <!-- A "Connector" using the shared thread pool-->
-     <!--
-     <Connector executor="tomcatThreadPool"
-@@ -165,6 +168,10 @@
-                prefix="localhost_access_log" suffix=".txt"
-                pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-+        <Valve className="org.apache.catalina.valves.RemoteIpValve"
-+               remoteIpHeader="x-forwarded-for"
-+               proxiesHeader="x-forwarded-by"
-+               protocolHeader="x-forwarded-proto" />
-       </Host>
-     </Engine>
-   </Service>
diff --git a/src/docker/start.sh b/src/docker/start.sh
index 9ef13bbf..68365c0c 100644
--- a/src/docker/start.sh
+++ b/src/docker/start.sh
@@ -96,36 +96,6 @@ sed -i "s|{nngm-mainzelliste-apikey}|${NNGM_MAINZELLISTE_APIKEY}|"          "$fi
 sed -i "s|{nngm-mainzelliste-url}|${NNGM_MAINZELLISTE_URL}|"                "$file"
 sed -i "s|{nngm-cryptkey}|${NNGM_CRYPTKEY}|"                                "$file"
 
-if [ -n "$TOMCAT_REVERSEPROXY_FQDN" ]; then
-  echo "Info: Configuring reverse proxy for URL ${TOMCAT_REVERSEPROXY_FQDN}";
-  mv "${CATALINA_HOME}/conf/server.xml" "${CATALINA_HOME}/conf/server.xml.ori";
-  ## Apply add reverse proxy configuration to
-  echo "Info: applying ${CATALINA_HOME}/conf/server.reverseproxy.patch on ${CATALINA_HOME}/conf/server.xml"
-  patch -i "${CATALINA_HOME}/conf/server.reverseproxy.patch" -o "${CATALINA_HOME}/conf/server.xml" "${CATALINA_HOME}/conf/server.xml.ori"
-  if [ -z "$TOMCAT_REVERSEPROXY_PORT" ]; then
-	  case "$TOMCAT_REVERSEPROXY_SSL" in
-	  	true)
-	  		TOMCAT_REVERSEPROXY_PORT=443
-	  		TOMCAT_REVERSEPROXY_SCHEME=https
-	  		;;
-	  	false)
-	  		TOMCAT_REVERSEPROXY_PORT=80
-	  		TOMCAT_REVERSEPROXY_SCHEME=http
-	  		;;
-	  	*)
-	  		echo "Error: Please set TOMCAT_REVERSEPROXY_SSL to either true or false."
-	  		exit 1
-	  esac
-  fi
-  echo "Info: Applying configuration for ReverseProxy with settings: TOMCAT_REVERSEPROXY_FQDN=$TOMCAT_REVERSEPROXY_FQDN TOMCAT_REVERSEPROXY_PORT=${TOMCAT_REVERSEPROXY_PORT} TOMCAT_REVERSEPROXY_SSL=${TOMCAT_REVERSEPROXY_SSL}"
-  sed -i -e "s|{tomcat_reverseproxy_fqdn}|${TOMCAT_REVERSEPROXY_FQDN}|g ; \
-  	s|{tomcat_reverseproxy_scheme}|${TOMCAT_REVERSEPROXY_SCHEME}|g ; \
-  	s|{tomcat_reverseproxy_port}|${TOMCAT_REVERSEPROXY_PORT}|g ; \
-  	s|{tomcat_reverseproxy_ssl}|${TOMCAT_REVERSEPROXY_SSL}|g" \
-  	"${CATALINA_HOME}"/conf/server.xml;
-  echo "Info: ReverseProxy configuration is finished"
-fi
-
 export CATALINA_OPTS="${CATALINA_OPTS} -javaagent:/docker/jmx_prometheus_javaagent-0.3.1.jar=9100:/docker/jmx-exporter.yml"
 
 # SSL Certs