4 files changed, 87 insertions, 170 deletions
diff --git a/jenkins-server-slave-setup/scripts/jenkins-initd-debian b/jenkins-server-slave-setup/scripts/jenkins-initd-debian
new file mode 100755
index 0000000..3b5fa5c
--- /dev/null
+++ b/jenkins-server-slave-setup/scripts/jenkins-initd-debian
@@ -0,0 +1,83 @@
+#! /bin/bash
+### BEGIN INIT INFO
+# Provides:          jenkins
+# Required-Start:    $local_fs $remote_fs $network $syslog $time
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Should-Start:      apache2
+# Should-Stop:       
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Jenkins init script.
+# Description:       Init script for Jenkins, a Continuous Integration server.
+### END INIT INFO
+
+#
+# jenkins    Start/Stop the Jenkins Continuous Integration server.
+#
+# chkconfig: 345 91 10
+# description: Jenkins is a Continuous Integration server. \
+# processname: jenkins
+# pidfile: /var/run/jenkins.pid
+
+
+# Source function library.
+. /lib/lsb/init-functions
+
+# Check that networking is up.
+# [ "${NETWORKING}" = "no" ] && exit 0
+
+JENKINS_USER=jogamp_ci
+JENKINS_HOME=/srv/jenkins
+startup=$JENKINS_HOME/scripts/start.jenkins.sh
+shutdown=$JENKINS_HOME/scripts/stop.jenkins.sh
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
+
+start(){
+ echo -n $"Starting Jenkins service: "
+ su - $JENKINS_USER -c $startup
+ RETVAL=$?
+ echo
+}
+
+stop(){
+ action $"Stopping Jenkins service: " 
+ su - $JENKINS_USER -c $shutdown 
+ RETVAL=$?
+ echo
+}
+
+status(){
+ numproc=`ps -ef | grep jenkins.war | grep -v "grep jenkins.war" | wc -l`
+ if [ $numproc -gt 0 ]; then
+  echo "Jenkins is running..."
+  else
+  echo "Jenkins is stopped..."
+ fi
+}
+
+restart(){
+  stop
+  start
+}
+
+
+# See how we were called.
+case "$1" in
+start)
+ start
+ ;;
+stop)
+ stop
+ ;;
+status)
+ status
+ ;; 
+restart)
+ restart
+ ;;
+*)
+ echo $"Usage: $0 {start|stop|status|restart}"
+ exit 1
+esac
+
+exit 0
diff --git a/jenkins-server-slave-setup/scripts/jenkins-start-rh b/jenkins-server-slave-setup/scripts/jenkins-initd-redhat
index ddeb1e2..6606e94 100755
--- a/jenkins-server-slave-setup/scripts/jenkins-start-rh
+++ b/jenkins-server-slave-setup/scripts/jenkins-initd-redhat
@@ -17,11 +17,11 @@
 # Check that networking is up.
 [ "${NETWORKING}" = "no" ] && exit 0
 
-JENKINS_USER=jogl
+JENKINS_USER=jogamp_ci
 JENKINS_HOME=/srv/jenkins
 startup=$JENKINS_HOME/scripts/start.jenkins.sh
 shutdown=$JENKINS_HOME/scripts/stop.jenkins.sh
-export JAVA_HOME=/opt-linux-x86_64/j2se6
+export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
 
 start(){
  echo -n $"Starting Jenkins service: "
diff --git a/jenkins-server-slave-setup/scripts/jenkins-initd-ubuntu b/jenkins-server-slave-setup/scripts/jenkins-initd-ubuntu
deleted file mode 100755
index cf0d9f4..0000000
--- a/jenkins-server-slave-setup/scripts/jenkins-initd-ubuntu
+++ /dev/null
@@ -1,167 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          jenkins
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      S 0 1 6
-# Short-Description: Jenkins initscript
-# Description:       Jenkins Continuous Integration System
-### END INIT INFO
-
-# Author: Luis Alves <luis DOT alves AT lafaspot DOT com>
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-JENKINS_HOME=/srv/jenkins
-#LOG="$JENKINS_HOME/log/jenkins.log"
-DESC="Jenkins Continous Build Integration"
-CHUID="jenkins:jenkins"
-NAME=jenkins
-DAEMON="/usr/bin/java"
-DAEMON_ARGS="-jar "$JENKINS_HOME/jenkins.war" --httpPort=8080 --prefix=/chuck"
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-export JENKINS_HOME
-
-# Exit if the package is not installed
-# [ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-
-pid_of_jenkins() {
-    cat "$PIDFILE"
-}
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-        #[ -e "$LOG" ] && cnt=`wc -l "$LOG" | awk '{ print $1 }'` || cnt=1
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $DAEMON --chuid $CHUID -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-        #while { pid_of_jenkins > /dev/null ; } &&
-        #        ! { tail +$cnt "$LOG" | grep -q 'Winstone Servlet Engine .* running' ; } ; do
-        #      sleep 1
-        #done
-
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:
-
diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh
index cd5187b..dae439f 100755
--- a/jenkins-server-slave-setup/scripts/start.jenkins.sh
+++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh
@@ -3,5 +3,6 @@ export JENKINS_HOME=/srv/jenkins
 export JENKINS_WAR=$JENKINS_HOME/jenkins.war
 export JENKINS_LOG=$JENKINS_HOME/jenkins.log
 JAVA=$JAVA_HOME/bin/java
-nohup nice $JAVA -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
+nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
+# nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=-1 --httpsPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &