From 28f21b847430054f30fe62651befb6f4e93c8834 Mon Sep 17 00:00:00 2001
From: Per Andersson <avtobiff@gmail.com>
Date: Sat, 17 Apr 2010 18:13:02 +0200
Subject: added init script and default settings for it.

---
 etherpad/bin/etherpad.default |  42 +++++++++++
 etherpad/bin/etherpad.init    | 157 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 etherpad/bin/etherpad.default
 create mode 100644 etherpad/bin/etherpad.init

diff --git a/etherpad/bin/etherpad.default b/etherpad/bin/etherpad.default
new file mode 100644
index 0000000..e5ef128
--- /dev/null
+++ b/etherpad/bin/etherpad.default
@@ -0,0 +1,42 @@
+# Default settings for etherpad. This file is sourced by /bin/sh from
+# /etc/init.d/etherpad.
+
+# Setup paths
+ETHERPAD_HOME=/usr/local/etherpad
+JAVA=/usr/bin/java
+JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+SCALA=/usr/bin/scala
+SCALA_HOME=/usr/share/java
+MYSQL_CONNECTOR_JAR=/usr/share/java/mysql-connector-java.jar
+
+# Maximum amount of RAM to allocate
+MXRAM="1G"
+
+# Classpath
+CP="appjet-eth-dev.jar:data"
+for f in "$ETHERPAD_HOME/etherpad/lib/*.jar"; do
+    CP="$CP:$f"
+done
+
+# Java options
+JAVA_OPTS=""
+
+# Config file
+CFGFILE=/etc/etherpad/local.properties
+
+# Default options
+ETHERPAD_OPTS="-classpath $CP \
+               -server \
+               -Xmx${MXRAM} \
+               -Xms${MXRAM} \
+               -Djava.awt.headless=true \
+               -XX:MaxGCPauseMillis=500 \
+               -XX:+UseConcorMarkSweepGC \
+               -XX:CMSIncrementalSafetyFactor=50 \
+               -XX:+PrintGCDetails \
+               -XX:+PrintGCTimeStamps \
+               -Xloggc:./data/logs/backend/jvm-gc.log \
+               -Dappjet.jmxremote=true \
+               $JAVA_OPTS \
+               net.appjet.oui.main \
+               --configFile=$CFGFILE"
diff --git a/etherpad/bin/etherpad.init b/etherpad/bin/etherpad.init
new file mode 100644
index 0000000..010e811
--- /dev/null
+++ b/etherpad/bin/etherpad.init
@@ -0,0 +1,157 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          etherpad
+# Required-Start:    $networking $syslog
+# Required-Stop:     $networking $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: EtherPad init script
+# Description:       EtherPad is a collaborative real-time editor, this script
+#                    starts and stops an etherpad daemon. It should be placed
+#                    in /etc/init.d.
+### END INIT INFO
+
+# Author: Per Andersson <avtobiff@gmail.com>
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Collaborative real-time editor"
+NAME=etherpad
+#DAEMON=/usr/sbin/$NAME
+#DAEMON_ARGS="--options args"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# 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
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# 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 --make-pidfile \
+		--exec $JAVA --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
+		--exec $JAVA -- $ETHERPAD_OPTS
+		|| 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.
+}
+
+#
+# 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
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  #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|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:
-- 
cgit v1.2.3-1-g7c22


From 3f4e093ccdb793ef940d21c834fd2ada861f05b4 Mon Sep 17 00:00:00 2001
From: Per Andersson <avtobiff@gmail.com>
Date: Sat, 17 Apr 2010 18:33:51 +0200
Subject: added option to configure uid:gid to run daemon as.

---
 etherpad/bin/etherpad.default |  4 ++++
 etherpad/bin/etherpad.init    | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/etherpad/bin/etherpad.default b/etherpad/bin/etherpad.default
index e5ef128..1943cdc 100644
--- a/etherpad/bin/etherpad.default
+++ b/etherpad/bin/etherpad.default
@@ -1,6 +1,10 @@
 # Default settings for etherpad. This file is sourced by /bin/sh from
 # /etc/init.d/etherpad.
 
+# User and group to run as
+ETHERPAD_USER="etherpad"
+ETHERPAD_GROUP="etherpad"
+
 # Setup paths
 ETHERPAD_HOME=/usr/local/etherpad
 JAVA=/usr/bin/java
diff --git a/etherpad/bin/etherpad.init b/etherpad/bin/etherpad.init
index 010e811..9c2f447 100644
--- a/etherpad/bin/etherpad.init
+++ b/etherpad/bin/etherpad.init
@@ -23,6 +23,8 @@ NAME=etherpad
 #DAEMON_ARGS="--options args"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
+CHUID="$ETHERPAD_USER:$ETHERPAD_GROUP"
+
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
@@ -46,11 +48,17 @@ do_start()
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
+
+	# Run as etherpad:etherpad by defaut
+	if [ "$CHUID" = ":" ]; then
+		CHUID="etherpad:etherpad"
+	fi
+
 	start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
-		--exec $JAVA --test > /dev/null \
+		--chuid $CHUID --exec $JAVA --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
-		--exec $JAVA -- $ETHERPAD_OPTS
+		--chuid $CHUID --exec $JAVA -- $ETHERPAD_OPTS
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
-- 
cgit v1.2.3-1-g7c22


From 3e5f9ce411d848f8eeeda36ded7b4214a394b220 Mon Sep 17 00:00:00 2001
From: Per Andersson <avtobiff@gmail.com>
Date: Sat, 17 Apr 2010 18:34:25 +0200
Subject: cleaned up init script from unused variables.

---
 etherpad/bin/etherpad.init | 2 --
 1 file changed, 2 deletions(-)

diff --git a/etherpad/bin/etherpad.init b/etherpad/bin/etherpad.init
index 9c2f447..3e05ea8 100644
--- a/etherpad/bin/etherpad.init
+++ b/etherpad/bin/etherpad.init
@@ -19,8 +19,6 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Collaborative real-time editor"
 NAME=etherpad
-#DAEMON=/usr/sbin/$NAME
-#DAEMON_ARGS="--options args"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 CHUID="$ETHERPAD_USER:$ETHERPAD_GROUP"
-- 
cgit v1.2.3-1-g7c22


From 300ef2b59f971ec113145f61479fd83fcc21399e Mon Sep 17 00:00:00 2001
From: Per Andersson <avtobiff@gmail.com>
Date: Sat, 17 Apr 2010 18:40:32 +0200
Subject: init script checks that etherpad jar exists.

---
 etherpad/bin/etherpad.init | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etherpad/bin/etherpad.init b/etherpad/bin/etherpad.init
index 3e05ea8..30d20d2 100644
--- a/etherpad/bin/etherpad.init
+++ b/etherpad/bin/etherpad.init
@@ -19,13 +19,14 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Collaborative real-time editor"
 NAME=etherpad
+ETHERPAD_JAR="/usr/local/etherpad/etherpad/appjet-eth-dev.jar"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 CHUID="$ETHERPAD_USER:$ETHERPAD_GROUP"
 
 
 # Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
+[ -f "$ETHERPAD_JAR" ] || exit 0
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
-- 
cgit v1.2.3-1-g7c22


From c7c6d9a54da8c5cc2e31f674f37ab6644d9694f6 Mon Sep 17 00:00:00 2001
From: Per Andersson <avtobiff@gmail.com>
Date: Sat, 17 Apr 2010 19:18:34 +0200
Subject: corrections and additions to init script defaults.

* corrected classpath so it has the correct path.
* added missing and corrected erroneus options passed to java.
---
 etherpad/bin/etherpad.default | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/etherpad/bin/etherpad.default b/etherpad/bin/etherpad.default
index 1943cdc..dcceea9 100644
--- a/etherpad/bin/etherpad.default
+++ b/etherpad/bin/etherpad.default
@@ -17,8 +17,8 @@ MYSQL_CONNECTOR_JAR=/usr/share/java/mysql-connector-java.jar
 MXRAM="1G"
 
 # Classpath
-CP="appjet-eth-dev.jar:data"
-for f in "$ETHERPAD_HOME/etherpad/lib/*.jar"; do
+CP="$ETHERPAD_HOME/etherpad/appjet-eth-dev.jar:$ETHERPAD_HOME/etherpad/data"
+for f in "$ETHERPAD_HOME"/etherpad/lib/*.jar; do
     CP="$CP:$f"
 done
 
@@ -35,11 +35,12 @@ ETHERPAD_OPTS="-classpath $CP \
                -Xms${MXRAM} \
                -Djava.awt.headless=true \
                -XX:MaxGCPauseMillis=500 \
-               -XX:+UseConcorMarkSweepGC \
+               -XX:+UseConcMarkSweepGC \
+               -XX:+CMSIncrementalMode \
                -XX:CMSIncrementalSafetyFactor=50 \
                -XX:+PrintGCDetails \
                -XX:+PrintGCTimeStamps \
-               -Xloggc:./data/logs/backend/jvm-gc.log \
+               -Xloggc:$ETHERPAD_HOME/etherpad/data/logs/backend/jvm-gc.log \
                -Dappjet.jmxremote=true \
                $JAVA_OPTS \
                net.appjet.oui.main \
-- 
cgit v1.2.3-1-g7c22