[java-idp-tomcat-base] branch 8.0 updated: Make Tomcat's shutdown password a property

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch 8.0
in repository java-idp-tomcat-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-tomcat-base.git;a=commit;h=ad3b4ef1c27c6bbd86e62a2511999b8e00778185

The following commit(s) were added to refs/heads/8.0 by this push:
       new  ad3b4ef   Make Tomcat's shutdown password a property
ad3b4ef is described below

commit ad3b4ef1c27c6bbd86e62a2511999b8e00778185
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 10 19:04:45 2016 -0500

    Make Tomcat's shutdown password a property
---
 src/main/resources/tomcat-base/conf/catalina.properties | 2 ++
 src/main/resources/tomcat-base/conf/server.xml          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/tomcat-base/conf/catalina.properties b/src/main/resources/tomcat-base/conf/catalina.properties
index 776b8cc..029628c 100644
--- a/src/main/resources/tomcat-base/conf/catalina.properties
+++ b/src/main/resources/tomcat-base/conf/catalina.properties
@@ -272,4 +272,6 @@ tomcat.backchannel.keystoreType=PKCS12
 #
 tomcat.nonhttps.host=localhost
 tomcat.nonhttps.port=8080
+
 tomcat.shutdown.port=8005
+tomcat.shutdown.password=SHUTDOWN
diff --git a/src/main/resources/tomcat-base/conf/server.xml b/src/main/resources/tomcat-base/conf/server.xml
index 99fbeb1..976e7e7 100644
--- a/src/main/resources/tomcat-base/conf/server.xml
+++ b/src/main/resources/tomcat-base/conf/server.xml
@@ -19,7 +19,7 @@
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
  -->
-<Server port="${tomcat.shutdown.port}" shutdown="SHUTDOWN">
+<Server port="${tomcat.shutdown.port}" shutdown="${tomcat.shutdown.password}">
   <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.