This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jetty9.
commit ccdab38dd24bd52d11ff5e2ad7c404f98b198ce6 Author: Emmanuel Bourg <[email protected]> Date: Thu Dec 3 15:16:09 2015 +0100 Removed JETTY_HOST and JETTY_PORT from /etc/default/jetty9 (now configured in start.ini) --- debian/jetty9.default | 9 --------- debian/jetty9.init | 26 +++----------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/debian/jetty9.default b/debian/jetty9.default index 5bea729..9721bfb 100644 --- a/debian/jetty9.default +++ b/debian/jetty9.default @@ -10,15 +10,6 @@ VERBOSE=yes # Set this to an empty string to prevent Jetty from starting automatically #JETTY_USER=jetty -# Listen to connections from this network host -# Use 0.0.0.0 as host to accept all connections. -# Uncomment to restrict access to localhost -#JETTY_HOST=$(uname -n) - -# The network port used by Jetty -# Enable authbind to use a port lower than 1024 (see below) -#JETTY_PORT=8080 - # Timeout in seconds for the shutdown of all webapps #JETTY_SHUTDOWN=30 diff --git a/debian/jetty9.init b/debian/jetty9.init index 02435ea..b3ebcad 100644 --- a/debian/jetty9.init +++ b/debian/jetty9.init @@ -47,15 +47,6 @@ # JAVA_OPTIONS # Extra options to pass to the JVM # -# JETTY_PORT -# Override the default port for Jetty servers. If not set then 8080 -# will be used. The java system property "jetty.port" will be set to -# this value for use in configure.xml files. For example, the following -# idiom is widely used in the demo config files to respect this property -# in Listener configuration elements: -# -# <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set> -# # JETTY_ARGS # The default arguments to pass to jetty. # @@ -99,13 +90,6 @@ NO_START=0 # Set this to an empty string to prevent Jetty from starting automatically JETTY_USER=jetty -# Listen to connections from this network host (leave empty to accept all connections) -#JETTY_HOST=$(uname -n) -JETTY_HOST=0.0.0.0 - -# The network port used by Jetty -JETTY_PORT=8080 - # Additional arguments to pass to Jetty JETTY_ARGS= @@ -194,9 +178,7 @@ JAVA_OPTIONS="$JAVA_OPTIONS \ -DSTART=$JETTY_START_CONFIG \ -Djetty.home=$JETTY_HOME \ -Djetty.logs=$LOGDIR \ - -Djetty.state=$JETTY_STATE \ - -Djetty.host=$JETTY_HOST \ - -Djetty.port=$JETTY_PORT" + -Djetty.state=$JETTY_STATE" export JAVA_OPTIONS @@ -381,7 +363,7 @@ case "$1" in exit 3 fi else - log_success_msg "$DESC is running with pid `cat $PIDFILE`, and is reachable on http://$JETTY_HOST:$JETTY_PORT/"; + log_success_msg "$DESC is running with pid `cat $PIDFILE`" fi ;; @@ -408,13 +390,11 @@ case "$1" in log_success_msg "JAVA_OPTIONS = $JAVA_OPTIONS" log_success_msg "JAVA = $JAVA" log_success_msg "JETTY_USER = $JETTY_USER" - log_success_msg "JETTY_HOST = $JETTY_HOST" - log_success_msg "JETTY_PORT = $JETTY_PORT" log_success_msg "ARGUMENTS = $ARGUMENTS" if [ -f $PIDFILE ] then - log_success_msg "$DESC is running with pid `cat $PIDFILE`, and is reachable on http://$JETTY_HOST:$JETTY_PORT/"; + log_success_msg "$DESC is running with pid `cat $PIDFILE`" exit 0 fi exit 1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
