* added sane init script for server

 * mauvesend now handles options better
 * jabber client has stub message receivng method

4 files changed, 192 insertions, 30 deletions

diff --git a/debian/mauvealert-common.install b/debian/mauvealert-common.install
index 024d922..99771ab 100644
--- a/debian/mauvealert-common.install
+++ b/debian/mauvealert-common.install
@@ -1,3 +1,5 @@
 mauve.proto         usr/lib/mauvealert/
 lib/mauve/proto.rb  usr/lib/ruby/1.8/mauve/
+lib/mauve/mauve_time.rb  usr/lib/ruby/1.8/mauve/
+
 
diff --git a/debian/mauvealert-server.dirs b/debian/mauvealert-server.dirs
new file mode 100644
index 0000000..ae8ddd8
--- /dev/null
+++ b/debian/mauvealert-server.dirs
@@ -0,0 +1,2 @@
+var/lib/mauvealert
+var/log/mauvealert
diff --git a/debian/mauvealert-server.init b/debian/mauvealert-server.init
new file mode 100644
index 0000000..1f0e57f
--- /dev/null
+++ b/debian/mauvealert-server.init
@@ -0,0 +1,159 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          mauvealert
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Mauve Server
+# Description:       Mauve Server 
+### END INIT INFO
+
+# Author: Patrick J Cherry <patrick@bytemark.co.uk>
+#
+
+# 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="Mauve Alert Server"
+NAME=mauveserver
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS="/etc/mauvealert/$NAME.conf"
+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
+
+VERBOSE=1
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /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 --startas $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --startas $DAEMON -- \
+		$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.
+
+	sleep 5
+}
+
+#
+# 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 --pidfile $PIDFILE --name $NAME
+	[ "$?" = 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)
+	#
+	# 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
+
diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install
index 630990d..47a3add 100644
--- a/debian/mauvealert-server.install
+++ b/debian/mauvealert-server.install
@@ -1,31 +1,30 @@
-bin/mauveserver                           usr/bin/
-lib/mauve/notifiers.rb                    usr/lib/ruby/1.8/mauve/
-lib/mauve/notification.rb                 usr/lib/ruby/1.8/mauve/
-lib/mauve/alert.rb                        usr/lib/ruby/1.8/mauve/
-lib/mauve/time.rb                         usr/lib/ruby/1.8/mauve/
-lib/mauve/alert_changed.rb                usr/lib/ruby/1.8/mauve/
-lib/mauve/source_list.rb                  usr/lib/ruby/1.8/mauve/
-lib/mauve/alert_group.rb                  usr/lib/ruby/1.8/mauve/
-lib/mauve/web_sinatra.rb                  usr/lib/ruby/1.8/mauve/
-lib/mauve/configuration.rb                usr/lib/ruby/1.8/mauve/
-lib/mauve/calendar_interface.rb           usr/lib/ruby/1.8/mauve/
-lib/mauve/auth_bytemark.rb                usr/lib/ruby/1.8/mauve/
-lib/mauve/people_list.rb                  usr/lib/ruby/1.8/mauve/
-lib/mauve/person.rb                       usr/lib/ruby/1.8/mauve/
-lib/mauve/web_interface.rb                usr/lib/ruby/1.8/mauve/
-lib/mauve/timers.rb                       usr/lib/ruby/1.8/mauve/
-lib/mauve/server.rb                       usr/lib/ruby/1.8/mauve/
-lib/mauve/datamapper.rb                   usr/lib/ruby/1.8/mauve/
-lib/mauve/notifiers/sms_aql.rb            usr/lib/ruby/1.8/mauve/notifiers/
-lib/mauve/notifiers/xmpp-smack.rb         usr/lib/ruby/1.8/mauve/notifiers/
-lib/mauve/notifiers/debug.rb              usr/lib/ruby/1.8/mauve/notifiers/
-lib/mauve/notifiers/email.rb              usr/lib/ruby/1.8/mauve/notifiers/
-lib/mauve/notifiers/xmpp.rb               usr/lib/ruby/1.8/mauve/notifiers/
-lib/mauve/notifiers/sms_default.rb        usr/lib/ruby/1.8/mauve/notifiers/
-lib/dm-sqlite-adapter-with-mutex.rb       usr/lib/ruby/1.8/
-lib/sinatra-partials.rb                   usr/lib/ruby/1.8/
-lib/object_builder.rb                     usr/lib/ruby/1.8/
-lib/rack-flash.rb                         usr/lib/ruby/1.8/
-static                                    usr/share/mauvealert
-views                                     usr/share/mauvealert
+bin/mauveserver                      usr/sbin/
+lib/dm-sqlite-adapter-with-mutex.rb  usr/lib/ruby/1.8/
+lib/mauve/alert.rb                   usr/lib/ruby/1.8/mauve/
+lib/mauve/alert_changed.rb           usr/lib/ruby/1.8/mauve/
+lib/mauve/alert_group.rb             usr/lib/ruby/1.8/mauve/
+lib/mauve/auth_bytemark.rb           usr/lib/ruby/1.8/mauve/
+lib/mauve/calendar_interface.rb      usr/lib/ruby/1.8/mauve/
+lib/mauve/configuration.rb           usr/lib/ruby/1.8/mauve/
+lib/mauve/datamapper.rb              usr/lib/ruby/1.8/mauve/
+lib/mauve/http_server.rb             usr/lib/ruby/1.8/mauve/
+lib/mauve/mauve_thread.rb            usr/lib/ruby/1.8/mauve/
+lib/mauve/notification.rb            usr/lib/ruby/1.8/mauve/
+lib/mauve/notifier.rb                usr/lib/ruby/1.8/mauve/
+lib/mauve/notifiers                  usr/lib/ruby/1.8/mauve/
+lib/mauve/notifiers.rb               usr/lib/ruby/1.8/mauve/
+lib/mauve/people_list.rb             usr/lib/ruby/1.8/mauve/
+lib/mauve/person.rb                  usr/lib/ruby/1.8/mauve/
+lib/mauve/processor.rb               usr/lib/ruby/1.8/mauve/
+lib/mauve/server.rb                  usr/lib/ruby/1.8/mauve/
+lib/mauve/source_list.rb             usr/lib/ruby/1.8/mauve/
+lib/mauve/timer.rb                   usr/lib/ruby/1.8/mauve/
+lib/mauve/udp_server.rb              usr/lib/ruby/1.8/mauve/
+lib/mauve/web_interface.rb           usr/lib/ruby/1.8/mauve/
+lib/object_builder.rb                usr/lib/ruby/1.8/
+lib/rack-flash.rb                    usr/lib/ruby/1.8/
+lib/sinatra-partials.rb              usr/lib/ruby/1.8/
+static                               usr/share/mauvealert
+views                                usr/share/mauvealert
+mauveserver.conf                     etc/mauvealert/