Skip to content

Added secure="true" to the Tomcat Connector #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndp-opendap wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added secure="true" to the Tomcat Connector #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25eea22
Added secure="true" to the Tomcat Connector
ndp-opendap Sep 16, 2025
ff3a3aa
Merge branch 'master' into secure-connector
ndp-opendap Sep 16, 2025
7ecff3f
merged master to secure-connector
ndp-opendap Mar 12, 2026
8f4079a
Cleaned up TODO
ndp-opendap Mar 12, 2026
7a45420
Added secure="true" to Connector in tomcat11-server.xml
ndp-opendap Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions el8-builds/ngap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,10 @@ ENV PATH $CATALINA_HOME/bin:$PATH
RUN set -e && echo "CATALINA_HOME: ${CATALINA_HOME}" >&2

# Install our modified server.xml so that the server compresses responses.
COPY tomcat9-server.xml /
RUN set -e \
&& mv /tomcat9-server.xml ${CATALINA_HOME}/conf/server.xml \
&& chown -R tomcat:tomcat ${CATALINA_HOME}/conf/server.xml
COPY tomcat9-server.xml ${CATALINA_HOME}/conf/server.xml
RUN set -e && chown -R tomcat:tomcat ${CATALINA_HOME}/conf/server.xml

# Tweak the mime-type for javascript. (@TODO Will this satisfy X-Content-Type-Options=nosniff issues?)
# Modernize the mime-type for javascript. from text/javascript to application/javascript
Run set -e \
&& sed -i 's+text/javascript+application/javascript+g' ${CATALINA_HOME}/conf/web.xml

Expand Down
1 change: 1 addition & 0 deletions el8-builds/ngap/tomcat9-server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
protocol="org.apache.coyote.http11.Http11AprProtocol"
maxThreads="150"
SSLEnabled="true"
secure="true"
compression="force"
compressionMinSize="2048"
compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/octet-stream,application/vnd.opendap.dap4.dataset-metadata+xml,application/vnd.opendap.dap4.data,application/vnd.opendap.dap4.error+xml,application/json,application/prs.coverage+json,application/rdf+xml,application/x-netcdf,image/tiff;application=geotiff"
Expand Down
8 changes: 0 additions & 8 deletions el9-builds/hyrax/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,6 @@ RUN set -e \
&& rm -fv "/$TOMCAT_DISTRO.tar.gz" \
&& echo "# Tomcat is unpacked and ready. >&2 "

# @TODO REMOVE THIS COMMENTED OUT CODE BEFORE MERGE
#COPY tomcat.service /etc/systemd/system/tomcat.service
#RUN set -e \
# && which systemctl \
# && systemctl enable tomcat
#RUN firewall-cmd --add-port 8080/tcp --permanent
#RUN firewall-cmd --reload

ENV CATALINA_HOME=/usr/share/tomcat
ENV PATH=$CATALINA_HOME/bin:$PATH
RUN set -e && echo "# CATALINA_HOME: $CATALINA_HOME" >&2
Expand Down
21 changes: 6 additions & 15 deletions el9-builds/ngap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,26 +332,17 @@ RUN set -e \
&& chown -R tomcat:tomcat /var/log/tomcat /home/tomcat \
&& echo "# Tomcat is unpacked and ready. >&2 "

# @TODO REMOVE THIS FOLLOWING COMMENTED OUT CODE BEFORE MERGE
#COPY tomcat.service /etc/systemd/system/tomcat.service
#RUN set -e \
# && echo "$HR2" >&2 \
# && echo "# Calling: 'systemctl enable tomcat'" >&2 \
# && echo "# $(systemctl enable tomcat)" >&2 \
# && echo "# systemctl status: $?" >&2 \
# && echo "$HR" >&2
#RUN firewall-cmd --add-port 8080/tcp --permanent
#RUN firewall-cmd --reload

ENV CATALINA_HOME="/usr/share/tomcat"
ENV PATH="$CATALINA_HOME/bin:$PATH"
RUN set -e && echo "# CATALINA_HOME: $CATALINA_HOME" >&2

# Install our modified server.xml so that the server compresses responses.
COPY tomcat11-server.xml /
RUN set -e \
&& mv "/tomcat11-server.xml" "$CATALINA_HOME/conf/server.xml" \
&& chown -R tomcat:tomcat "$CATALINA_HOME/conf/server.xml"
COPY tomcat11-server.xml "$CATALINA_HOME/conf/server.xml"
RUN set -e && chown -R tomcat:tomcat "$CATALINA_HOME/conf/server.xml"

# Modernize the mime-type for javascript. from text/javascript to application/javascript
Run set -e \
&& sed -i 's+text/javascript+application/javascript+g' ${CATALINA_HOME}/conf/web.xml

RUN set -e \
&& echo "Cleaning up Tomcat distribution files..." >&2 \
Expand Down
1 change: 1 addition & 0 deletions el9-builds/ngap/tomcat11-server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150"
SSLEnabled="true"
secure="true"
compression="force"
compressionMinSize="2048"
compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/octet-stream,application/vnd.opendap.dap4.dataset-metadata+xml,application/vnd.opendap.dap4.data,application/vnd.opendap.dap4.error+xml,application/json,application/prs.coverage+json,application/rdf+xml,application/x-netcdf,image/tiff;application=geotiff"
Expand Down