@@ -46,6 +46,9 @@ HUDSON_IS_DAEMON="true" ## the SSL KeyManagerFactory type (eg SunX509, IbmX509). Default is SunX509 #HUDSON_HTTPS_KEY_MANAGER="SunX509" +## Default home of hudson stuffs +#HUDSON_HOME=/var/lib/hudson + ## Default location to log #HUDSON_LOG_DIR=/var/log/hudson.log @@ -55,3 +58,5 @@ HUDSON_IS_DAEMON="true" ## set document root folder #HUDSON_WEBROOT=/var/lib/hudson/webroot +## any additionally flags available, see `hudson --help` +#OPT_ARGS="" projects/hudson/etc/hudson.conf @@ -35,37 +35,37 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi -set -e # Exit on most errors +set -e -VERSION=$(unzip -p hudson.war META-INF/maven/org.jvnet.hudson.main/hudson-war/pom.properties | grep -e '^version' | cut -d = -f 2) +VERSION=$(unzip -p $PRGNAM.war META-INF/maven/org.jvnet.$PRGNAM.main/$PRGNAM-war/pom.properties | grep -e '^version' | cut -d = -f 2) rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -mkdir -p $PKG/usr/lib/hudson -cp -av $CWD/hudson.war $PKG/usr/lib/hudson/ +mkdir -p $PKG/opt/$PRGNAM +cp -av $CWD/$PRGNAM.war $PKG/opt/$PRGNAM mkdir -p $PKG/usr/bin -cat $CWD/hudsond.sh > $PKG/usr/bin/hudsond -chmod +x $PKG/usr/bin/hudsond +cat $CWD/${PRGNAM}d.sh > $PKG/usr/bin/${PRGNAM}d +chmod +x $PKG/usr/bin/${PRGNAM}d -cat > $PKG/usr/bin/hudson << EOF +cat > $PKG/usr/bin/$PRGNAM << EOF #!/bin/sh -java -jar /usr/lib$LIBDIRSUFFIX/hudson/hudson.war \${1+"\$@"} +java -jar /opt/$PRGNAM/$PRGNAM.war \${1+"\$@"} EOF -chmod +x $PKG/usr/bin/hudson +chmod +x $PKG/usr/bin/$PRGNAM mkdir -p $PKG/etc/rc.d mkdir -p $PKG/etc/logrotate.d -cat $CWD/etc/rc.hudson > $PKG/etc/rc.d/rc.hudson.new -cat $CWD/etc/hudson.conf > $PKG/etc/hudson.conf.new -cat $CWD/etc/hudson-logrotate > $PKG/etc/logrotate.d/hudson +cat $CWD/etc/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new +cat $CWD/etc/$PRGNAM.conf > $PKG/etc/$PRGNAM.conf.new +cat $CWD/etc/$PRGNAM-logrotate > $PKG/etc/logrotate.d/$PRGNAM mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -java -jar $CWD/hudson.war --help > $PKG/usr/doc/$PRGNAM-$VERSION/HELP.txt +java -jar $CWD/$PRGNAM.war --help > $PKG/usr/doc/$PRGNAM-$VERSION/HELP.txt cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install projects/hudson/hudson.SlackBuild @@ -5,11 +5,12 @@ JAVA=$(which java) PIDFILE="/var/run/hudson.pid" -HUDSON="/usr/lib/hudson/hudson.war" +HUDSON="/opt/hudson/hudson.war" HUDSON_HTTP_PORT="8080" HUDSON_LOG_FILE="/var/log/hudson.log" HUDSON_WEBAPPSDIR="/var/lib/hudson/apps/" HUDSON_WEBROOT="/var/lib/hudson/webroot/" +OPT_ARGS="" export HUDSON_HOME="/var/lib/hudson" if [ "$UID" -ne 0 ] ; then @@ -17,7 +18,7 @@ if [ "$UID" -ne 0 ] ; then exit 1 fi -PREV_PID=$( pgrep -f "/usr/lib/hudson/hudson.war" ) +PREV_PID=$( pgrep -f "/opt/hudson/hudson.war" ) if [ ! "$PREV_PID" = "" ] ; then echo $PREV_PID still running exit 1 @@ -86,7 +87,8 @@ $JAVA -jar $HUDSON \ $HUDSON_HTTPS_KEY_MANAGER_ARG \ $HUDSON_LOG_FILE_ARG \ $HUDSON_WEBAPPSDIR_ARG \ + $OPT_ARGS \ $HUDSON_WEBROOT_ARG & -pgrep -f "/usr/lib/hudson/hudson.war" > $PIDFILE +pgrep -f "/opt/hudson/hudson.war" > $PIDFILE projects/hudson/hudsond.sh 3cccb5530ed7bd123900d2e37d80c0c42717e1d2 Vincent Batts vbatts@spiderpig.awarix.com http://github.com/vbatts/SlackBuilds/commit/63978a759e06e0abde5581d25b8eb8f8d4e43b3a 63978a759e06e0abde5581d25b8eb8f8d4e43b3a 2009-10-23T21:12:27-07:00 2009-10-23T21:12:27-07:00 Fri Oct 16 04:37:44 CDT 2009 * add to the `hudsond` and *.conf an OPTS ability to pass any additional --flags over and above the ENVIRONMENTS_VARIABLES availible * include HUDSON_HOME in the *.conf df82dd32e3b9da2b8e09da016829f6b3fb977087 Vincent Batts vbatts@spiderpig.awarix.com