[SCM] jenkins packaging branch, master, updated. debian/1.480.3+dfsg-1_exp1-10-g622bbac

[James Page]

The following commit has been merged in the master branch:
commit 949872c633cb53b1ebc66a0ed2b94f31ffec7dc4
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jul 2 11:52:46 2013 +0100

    d/jenkins.default: Provide variables for configuring listen address for http and ajp connections (Closes: #684586), listen on 127.0.0.1 by default to allow installs to be secured before wider access (Closes: #675233).

diff --git a/debian/changelog b/debian/changelog
index 39ed372..a1f2007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ jenkins (1.480.3+dfsg-1) unstable; urgency=low
   * Upload to unstable.
   * d/control: Fixup versioned inter-dependencies between jenkins
     packages (Closes: #704845).
+  * d/jenkins.default: Provide variables for configuring listen address
+    for http and ajp connections (Closes: #684586), listen on 127.0.0.1
+    by default to allow installs to be secured before wider access
+    (Closes: #675233).
 
  -- James Page <james.page at ubuntu.com>  Tue, 02 Jul 2013 11:38:50 +0100
 
diff --git a/debian/jenkins.default b/debian/jenkins.default
index 77be80c..d07aa1a 100644
--- a/debian/jenkins.default
+++ b/debian/jenkins.default
@@ -47,6 +47,12 @@ HTTP_PORT=8080
 # port for AJP connector (disabled by default)
 AJP_PORT=-1
 
+# Listen address for HTTP connector
+HTTP_HOST=127.0.0.1
+
+# Listen address for AJP connector
+AJP_HOST=127.0.0.1
+
 # arguments to pass to jenkins.
 # --javahome=$JAVA_HOME
 # --httpPort=$HTTP_PORT (default 8080; disable with -1)
@@ -55,4 +61,6 @@ AJP_PORT=-1
 # --argumentsRealm.passwd.$ADMIN_USER=[password]
 # --argumentsRealm.$ADMIN_USER=admin
 # --webroot=~/.jenkins/war
-JENKINS_ARGS="--webroot=$JENKINS_RUN/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT --preferredClassLoader=java.net.URLClassLoader"
+JENKINS_ARGS="--webroot=$JENKINS_RUN/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT"
+JENKINS_ARGS="$JENKINS_ARGS --httpListenAddress=$HTTP_HOST --ajpListenAddress=$AJP_HOST"
+JENKINS_ARGS="$JENKINS_ARGS --preferredClassLoader=java.net.URLClassLoader"

-- 
jenkins packaging