Update ebuild

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@30237 71c3de6d-444a-0410-be80-ed276b4c234a

ebuild/dev-util/hudson-bin/files/conf

 # Config file for /etc/init.d/hudson
 
-HUDSON_HOME="/var/lib/hudson"
+#
+# Directory where Hudson store its configuration and working
+# files (checkouts, build reports, artifacts, ...).
+#
+HUDSON_HOME="/var/lib/hudson/home"
 
+#
+# Options to pass to java when running Hudson.
+#
+HUDSON_JAVA_OPTIONS="-Djava.awt.headless=true"
+
+#
+# Port Hudson is listening on.
+#
 HUDSON_PORT="8080"
+
+#
+# Debug level for logs -- the higher the value, the more verbose.
+# 5 is INFO.
+#
+HUDSON_DEBUG_LEVEL="5"
+
+#
+# Whether to enable access logging or not.
+#
+HUDSON_ENABLE_ACCESS_LOG="no"
+
+#
+# Maximum number of HTTP worker threads.
+#
+HUDSON_HANDLER_MAX="100"
+
+#
+# Maximum number of idle HTTP worker threads.
+#
+HUDSON_HANDLER_IDLE="20"
+
+#
+# Pass arbitrary arguments to Hudson.
+# Eg.: --httpListenAddress=127.0.0.1 --prefix=/hudson
+# Full option list: java -jar hudson.war --help
+#
+HUDSON_ARGS=""
+
+HUDSON_BACKUP="/var/lib/hudson/backup"

ebuild/dev-util/hudson-bin/files/init

-#!/sbin/runscript
-
-depend() {
-    need net
-    use dns logger mysql postgresql
-}
-
-HUDSON_PIDFILE=/var/run/hudson/hudson.pid
-RUN_AS=hudson
-
-JAVA_HOME=`java-config --jre-home`
-COMMAND=$JAVA_HOME/bin/java
-OPTS="-Xmx256m -jar /usr/lib/hudson/hudson.war --logfile=/var/log/hudson/hudson.log"
-
-start() {
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --quiet --background \
-	--make-pidfile --pidfile $HUDSON_PIDFILE \
-	--chuid $RUN_AS \
-	--exec "${COMMAND}" -- $OPTS
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --pidfile $HUDSON_PIDFILE
-    eend $?
-}

ebuild/dev-util/hudson-bin/files/init.sh

+#!/sbin/runscript
+
+extra_commands="backup"
+
+depend() {
+    need net
+    use dns logger mysql postgresql
+}
+
+HUDSON_PIDFILE=/var/run/hudson/hudson.pid
+HUDSON_WAR=/usr/lib/hudson/hudson.war
+
+RUN_AS=hudson
+
+checkconfig() {
+    if [ ! -n "$HUDSON_HOME" ] ; then
+        eerror "HUDSON_HOME not configured"
+        return 1
+    fi
+    if [ ! -d "$HUDSON_HOME" ] ; then
+        eerror "HUDSON_HOME directory does not exist: $HUDSON_HOME"
+        return 1
+    fi
+    if [ ! -n "$HUDSON_BACKUP" ] ; then
+        eerror "HUDSON_BACKUP not configured"
+        return 1
+    fi
+    if [ ! -d "$HUDSON_BACKUP" ] ; then
+        eerror "HUDSON_BACKUP directory does not exist: $HUDSON_BACKUP"
+        return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return 1
+
+    JAVA_HOME=`java-config --jre-home`
+    COMMAND=$JAVA_HOME/bin/java
+
+    JAVA_PARAMS="$HUDSON_JAVA_OPTIONS -DHUDSON_HOME=$HUDSON_HOME -jar $HUDSON_WAR"
+
+    # Don't use --daemon here, because in this case stop will not work
+    PARAMS="--logfile=/var/log/hudson/hudson.log"
+    [ -n "$HUDSON_PORT" ] && PARAMS="$PARAMS --httpPort=$HUDSON_PORT"
+    [ -n "$HUDSON_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$HUDSON_DEBUG_LEVEL"
+    [ -n "$HUDSON_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$HUDSON_HANDLER_STARTUP"
+    [ -n "$HUDSON_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$HUDSON_HANDLER_MAX"
+    [ -n "$HUDSON_HANDLER_IDLE" ] && PARAMS="$PARAMS --handlerCountMaxIdle=$HUDSON_HANDLER_IDLE"
+    [ -n "$HUDSON_ARGS" ] && PARAMS="$PARAMS $HUDSON_ARGS"
+
+    if [ "$HUDSON_ENABLE_ACCESS_LOG" = "yes" ]; then
+        PARAMS="$PARAMS --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/hudson/access_log"
+    fi
+
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --quiet --background \
+        --make-pidfile --pidfile $HUDSON_PIDFILE \
+        --chuid $RUN_AS \
+        --exec "${COMMAND}" -- $JAVA_PARAMS $PARAMS
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --quiet --pidfile $HUDSON_PIDFILE
+    eend $?
+}
+
+backup() {
+    checkconfig || return 1
+
+    DATE=`date +%Y%m%d-%H%M`
+    tar -czvf $HUDSON_BACKUP/hudson-backup-$DATE.tar.gz -C $HUDSON_HOME .
+}

ebuild/dev-util/hudson-bin/hudson-bin-1.345.ebuild

-inherit java-pkg-2 rpm
-
-DESCRIPTION="Extensible continuous integration server"
-SRC_URI="http://hudson-ci.org/redhat/RPMS/noarch/hudson-${PV}-1.1.noarch.rpm"
-HOMEPAGE="http://hudson-ci.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jdk-1.5"
-
-src_unpack() {
-    rpm_src_unpack ${A}
-}
-
-pkg_setup() {
-    enewgroup hudson
-    enewuser hudson -1 /bin/bash /var/lib/hudson hudson
-}
-
-src_install() {
-    dodir /var/lib/hudson
-    dodir /var/log/hudson
-    dodir /var/run/hudson
-
-    insinto /usr/lib/hudson
-    doins usr/lib/hudson/hudson.war
-
-    newinitd "${FILESDIR}/init" hudson
-    newconfd "${FILESDIR}/conf" hudson
-
-    fowners hudson:hudson /var/lib/hudson
-    fowners hudson:hudson /var/run/hudson
-    fowners hudson:hudson /var/log/hudson
-}

ebuild/dev-util/hudson-bin/hudson-bin-1.353.ebuild

 inherit java-pkg-2 rpm
 
 DESCRIPTION="Extensible continuous integration server"
+# We are using rpm package here, because we want file with version.
 SRC_URI="http://hudson-ci.org/redhat/RPMS/noarch/hudson-${PV}-1.1.noarch.rpm"
 HOMEPAGE="http://hudson-ci.org/"
 LICENSE="MIT"
@@ -20,17 +21,14 @@ pkg_setup() {
 }
 
 src_install() {
-    dodir /var/lib/hudson
-    dodir /var/log/hudson
-    dodir /var/run/hudson
+    keepdir /var/run/hudson /var/log/hudson 
+    keepdir /var/lib/hudson/home /var/lib/hudson/backup
 
     insinto /usr/lib/hudson
     doins usr/lib/hudson/hudson.war
 
-    newinitd "${FILESDIR}/init" hudson
+    newinitd "${FILESDIR}/init.sh" hudson
     newconfd "${FILESDIR}/conf" hudson
 
-    fowners hudson:hudson /var/lib/hudson
-    fowners hudson:hudson /var/run/hudson
-    fowners hudson:hudson /var/log/hudson
+    fowners hudson:hudson /var/run/hudson /var/log/hudson /var/lib/hudson /var/lib/hudson/home /var/lib/hudson/backup
 }