[mlpack-svn] r13043 - mlpack/conf/packages/jenkins/trunk/upstream-debian
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Jun 13 11:01:56 EDT 2012
Author: speet3
Date: 2012-06-13 11:01:55 -0400 (Wed, 13 Jun 2012)
New Revision: 13043
Modified:
mlpack/conf/packages/jenkins/trunk/upstream-debian/changelog
mlpack/conf/packages/jenkins/trunk/upstream-debian/dirs
mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.default
mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.init
mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.install
mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postinst
mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postrm
Log:
bring in upstream changes for integration to our package
Modified: mlpack/conf/packages/jenkins/trunk/upstream-debian/changelog
===================================================================
--- mlpack/conf/packages/jenkins/trunk/upstream-debian/changelog 2012-06-13 14:01:14 UTC (rev 13042)
+++ mlpack/conf/packages/jenkins/trunk/upstream-debian/changelog 2012-06-13 15:01:55 UTC (rev 13043)
@@ -1,3 +1,315 @@
+jenkins (1.467) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 04 Jun 2012 21:24:20 -0700
+
+jenkins (1.466) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 28 May 2012 19:34:05 -0700
+
+jenkins (1.465) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 21 May 2012 14:02:58 -0700
+
+jenkins (1.464) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 14 May 2012 11:23:01 -0700
+
+jenkins (1.463) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 07 May 2012 10:42:26 -0700
+
+jenkins (1.462) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 30 Apr 2012 10:34:48 -0700
+
+jenkins (1.461) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 23 Apr 2012 15:17:44 -0700
+
+jenkins (1.461) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 23 Apr 2012 13:51:09 -0700
+
+jenkins (1.460) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Sat, 14 Apr 2012 21:48:41 -0700
+
+jenkins (1.459) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 09 Apr 2012 09:19:51 -0700
+
+jenkins (1.458) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 02 Apr 2012 11:30:58 -0700
+
+jenkins (1.457) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 26 Mar 2012 11:18:30 -0700
+
+jenkins (1.456) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 19 Mar 2012 09:22:05 -0700
+
+jenkins (1.455) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 12 Mar 2012 10:06:59 -0700
+
+jenkins (1.454) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 05 Mar 2012 19:39:34 -0800
+
+jenkins (1.453) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 05 Mar 2012 10:01:16 -0800
+
+jenkins (1.452) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 27 Feb 2012 09:08:51 -0800
+
+jenkins (1.451) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 13 Feb 2012 11:15:27 -0800
+
+jenkins (1.450) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 30 Jan 2012 14:40:26 -0800
+
+jenkins (1.449) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 23 Jan 2012 15:12:02 -0800
+
+jenkins (1.448) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Tue, 17 Jan 2012 09:40:34 -0800
+
+jenkins (1.447) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 09 Jan 2012 10:01:35 -0800
+
+jenkins (1.446) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 02 Jan 2012 19:13:01 -0800
+
+jenkins (1.445) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 26 Dec 2011 10:28:38 -0800
+
+jenkins (1.444) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 19 Dec 2011 12:48:57 -0800
+
+jenkins (1.443) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 12 Dec 2011 11:13:25 -0800
+
+jenkins (1.442) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 05 Dec 2011 10:09:27 -0800
+
+jenkins (1.441) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Sun, 27 Nov 2011 21:27:17 -0800
+
+jenkins (1.440) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Thu, 17 Nov 2011 22:00:00 -0800
+
+jenkins (1.439) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 14 Nov 2011 12:02:11 -0800
+
+jenkins (1.438) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 07 Nov 2011 13:46:28 -0800
+
+jenkins (1.437) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 31 Oct 2011 09:20:55 -0700
+
+jenkins (1.436) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Sun, 23 Oct 2011 22:30:51 -0700
+
+jenkins (1.435) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Wed, 19 Oct 2011 09:11:56 -0700
+
+jenkins (1.434) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Sun, 09 Oct 2011 15:55:38 -0700
+
+jenkins (1.433) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Sat, 01 Oct 2011 20:39:33 -0700
+
+jenkins (1.432) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 26 Sep 2011 09:08:37 -0700
+
+jenkins (1.431) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 19 Sep 2011 18:27:10 -0700
+
+jenkins (1.430) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Sun, 11 Sep 2011 19:36:51 -0700
+
+jenkins (1.429) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Tue, 06 Sep 2011 11:59:51 -0700
+
+jenkins (1.428) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 29 Aug 2011 10:22:33 -0700
+
+jenkins (1.427) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Fri, 19 Aug 2011 10:18:04 -0700
+
+jenkins (1.426) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 15 Aug 2011 21:21:43 -0700
+
+jenkins (1.425) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 08 Aug 2011 10:46:41 -0700
+
+jenkins (1.424) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 01 Aug 2011 11:31:30 -0700
+
+jenkins (1.423) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 25 Jul 2011 18:07:56 -0700
+
+jenkins (1.422) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 25 Jul 2011 13:50:47 -0700
+
+jenkins (1.421) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Sun, 17 Jul 2011 06:09:40 -0700
+
+jenkins (1.420) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 11 Jul 2011 13:51:49 -0700
+
+jenkins (1.419) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Tue, 05 Jul 2011 11:41:16 -0700
+
+jenkins (1.418) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 27 Jun 2011 09:53:46 -0700
+
+jenkins (1.417) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk at kohsuke.org> Mon, 20 Jun 2011 11:00:42 -0700
+
jenkins (1.416) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
Modified: mlpack/conf/packages/jenkins/trunk/upstream-debian/dirs
===================================================================
--- mlpack/conf/packages/jenkins/trunk/upstream-debian/dirs 2012-06-13 14:01:14 UTC (rev 13042)
+++ mlpack/conf/packages/jenkins/trunk/upstream-debian/dirs 2012-06-13 15:01:55 UTC (rev 13043)
@@ -11,3 +11,6 @@
# Store jenkins log file in it's own directory since they can become rather large and in the future
# rotating logs can be easily added.
var/log/jenkins
+
+# Cache directory for the unpacked jenkins.war file.
+var/cache/jenkins
Modified: mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.default
===================================================================
--- mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.default 2012-06-13 14:01:14 UTC (rev 13042)
+++ mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.default 2012-06-13 15:01:55 UTC (rev 13043)
@@ -8,6 +8,7 @@
# arguments to pass to java
#JAVA_ARGS="-Xmx256m"
+#JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address
PIDFILE=/var/run/jenkins/jenkins.pid
@@ -42,6 +43,9 @@
# port for AJP connector (disabled by default)
AJP_PORT=-1
+# servlet context, important if you want to use apache proxying
+PREFIX=/jenkins
+
# arguments to pass to jenkins.
# --javahome=$JAVA_HOME
# --httpPort=$HTTP_PORT (default 8080; disable with -1)
@@ -50,4 +54,6 @@
# --argumentsRealm.passwd.$ADMIN_USER=[password]
# --argumentsRealm.$ADMIN_USER=admin
# --webroot=~/.jenkins/war
-JENKINS_ARGS="--webroot=/var/run/jenkins/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT"
+# --prefix=$PREFIX
+
+JENKINS_ARGS="--webroot=/var/cache/jenkins/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT"
Modified: mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.init
===================================================================
--- mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.init 2012-06-13 14:01:14 UTC (rev 13042)
+++ mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.init 2012-06-13 15:01:55 UTC (rev 13043)
@@ -147,7 +147,7 @@
0)
$DAEMON $DAEMON_ARGS --stop || return 2
# wait for the process to really terminate
- for n in 1 2 3 4 5; do
+ for n in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
sleep 1
$DAEMON $DAEMON_ARGS --running || break
done
@@ -205,27 +205,35 @@
esac
;;
status)
- get_daemon_status
- case "$?" in
- 0) echo "$DESC is running with the pid `cat $PIDFILE`";;
- *)
- get_running
- procs=$?
- if [ $procs -eq 0 ]; then
- echo -n "$DESC is not running"
- if [ -f $PIDFILE ]; then
- echo ", but the pidfile ($PIDFILE) still exists"
- else
- echo
- fi
-
- else
- echo "$procs instances of jenkins are running at the moment"
- echo "but the pidfile $PIDFILE is missing"
- fi
- ;;
- esac
- ;;
+ get_daemon_status
+ case "$?" in
+ 0)
+ echo "$DESC is running with the pid `cat $PIDFILE`"
+ rc=0
+ ;;
+ *)
+ get_running
+ procs=$?
+ if [ $procs -eq 0 ]; then
+ echo -n "$DESC is not running"
+ if [ -f $PIDFILE ]; then
+ echo ", but the pidfile ($PIDFILE) still exists"
+ rc=1
+ else
+ echo
+ rc=3
+ fi
+
+ else
+ echo "$procs instances of jenkins are running at the moment"
+ echo "but the pidfile $PIDFILE is missing"
+ rc=0
+ fi
+
+ exit $rc
+ ;;
+ esac
+ ;;
*)
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 3
Modified: mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.install
===================================================================
--- mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.install 2012-06-13 14:01:14 UTC (rev 13042)
+++ mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.install 2012-06-13 15:01:55 UTC (rev 13043)
@@ -1,2 +1 @@
jenkins.war usr/share/jenkins
-debian/jenkins.list etc/apt/sources.list.d
Modified: mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postinst
===================================================================
--- mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postinst 2012-06-13 14:01:14 UTC (rev 13042)
+++ mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postinst 2012-06-13 15:01:55 UTC (rev 13043)
@@ -21,13 +21,16 @@
case "$1" in
configure)
+ [ -r /etc/default/jenkins ] && . /etc/default/jenkins
+ : ${JENKINS_USER:=jenkins}
+
# Create jenkins user if it doesn't exist.
# sometimes tools that users want Jenkins to run need a shell,
# so use /bin/bash. See JENKINS-4830
- if ! id jenkins > /dev/null 2>&1 ; then
+ if ! id $JENKINS_USER > /dev/null 2>&1 ; then
adduser --system --home /var/lib/jenkins --no-create-home \
--ingroup nogroup --disabled-password --shell /bin/bash \
- jenkins
+ $JENKINS_USER
fi
# If we have an old hudson install, rename it to jenkins
@@ -38,16 +41,20 @@
touch /var/lib/hudson/.from-hudson
mv -f /var/lib/hudson/* /var/lib/hudson/.??* /var/lib/jenkins
rmdir /var/lib/hudson
- find /var/lib/jenkins -user hudson -exec chown jenkins {} + || true
+ find /var/lib/jenkins -user hudson -exec chown $JENKINS_USER {} + || true
fi
# directories needed for jenkins
- chown jenkins:adm /var/lib/jenkins /var/log/jenkins
- chmod 750 /var/lib/jenkins /var/log/jenkins
+ # we don't do -R because it can take a long time on big installation
+ chown $JENKINS_USER:adm /var/lib/jenkins /var/log/jenkins
+ # we don't do "chmod 750" so that the user can choose the pemission for g and o on their own
+ chmod u+rwx /var/lib/jenkins /var/log/jenkins
- # make sure jenkins can delete everything in /var/run/jenkins to re-explode war
- chown -R jenkins:adm /var/run/jenkins
- chmod -R 750 /var/run/jenkins
+ # make sure jenkins can delete everything in /var/cache/jenkins to
+ # re-explode war. older installations may use /var/run/jenkins
+ # so make sure that they can delete too.
+ chown -R $JENKINS_USER:adm /var/cache/jenkins /var/run/jenkins
+ chmod -R 750 /var/cache/jenkins /var/run/jenkins
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postrm
===================================================================
--- mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postrm 2012-06-13 14:01:14 UTC (rev 13042)
+++ mlpack/conf/packages/jenkins/trunk/upstream-debian/jenkins.postrm 2012-06-13 15:01:55 UTC (rev 13043)
@@ -5,7 +5,8 @@
case "$1" in
purge)
userdel jenkins || true
- rm -rf /var/lib/jenkins /var/log/jenkins /var/run/jenkins
+ rm -rf /var/lib/jenkins /var/log/jenkins \
+ /var/run/jenkins /var/cache/jenkins
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
More information about the mlpack-svn
mailing list