[Git][java-team/tomcat8][master] Disabled the shutdown port (8005) by default

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tomcat8


Commits:
fef0df6d by Emmanuel Bourg at 2018-08-07T20:27:06Z
Disabled the shutdown port (8005) by default

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0023-disable-shutdown-by-socket.patch
- debian/patches/series
- debian/tomcat8-instance-create


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 tomcat8 (8.5.32-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Disabled the shutdown port (8005) by default
   * Added the missing Maven rules to use the 8.x generic version for
     tomcat-jaspic-api, tomcat-storeconfig and tomcat-util-scan
   * No longer set JSSE_HOME in the init script (JSSE is enabled by default)


=====================================
debian/patches/0023-disable-shutdown-by-socket.patch
=====================================
--- /dev/null
+++ b/debian/patches/0023-disable-shutdown-by-socket.patch
@@ -0,0 +1,14 @@
+Description: Disables the shutdown port (8005) by default
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/conf/server.xml
++++ b/conf/server.xml
+@@ -19,7 +19,7 @@
+      define subcomponents such as "Valves" at this level.
+      Documentation at /docs/config/server.html
+  -->
+-<Server port="8005" shutdown="SHUTDOWN">
++<Server port="-1" shutdown="SHUTDOWN">
+   <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+   <!-- Security listener. Documentation at /docs/config/listeners.html
+   <Listener className="org.apache.catalina.security.SecurityListener" />


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0018-fix-manager-webapp.patch
 0019-add-distribution-to-error-page.patch
 0021-dont-test-unsupported-ciphers.patch
+0023-disable-shutdown-by-socket.patch


=====================================
debian/tomcat8-instance-create
=====================================
--- a/debian/tomcat8-instance-create
+++ b/debian/tomcat8-instance-create
@@ -117,7 +117,7 @@ mkdir "${TARGET}/work"
 mkdir "${TARGET}/temp"
 cp -r /usr/share/tomcat8/skel/* "${TARGET}"
 
-sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml"
+sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"-1\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" "${TARGET}/conf/server.xml"
 
 cat > "${TARGET}/bin/startup.sh" << EOT
 #!/bin/sh



View it on GitLab: https://salsa.debian.org/java-team/tomcat8/commit/fef0df6d22fda526f0da04203a9da6ee774bf087

-- 
View it on GitLab: https://salsa.debian.org/java-team/tomcat8/commit/fef0df6d22fda526f0da04203a9da6ee774bf087
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180807/9884edd5/attachment.html>