From 494b083408b354f38da9b1fc5e8ffb7238d009b3 Mon Sep 17 00:00:00 2001
From: Patrick J Cherry <patrick@bytemark.co.uk>
Date: Thu, 14 Jul 2011 14:50:22 +0100
Subject: Fixed mauveclient to obey time multipliers Fixed logrotate script to
 rotate the correct script Init script now uses the correct user
 lib/mauve/history.rb is now installed Further logging cleanups

---
 debian/mauvealert-server.init      | 4 ++++
 debian/mauvealert-server.install   | 1 +
 debian/mauvealert-server.logrotate | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/mauvealert-server.init b/debian/mauvealert-server.init
index 15c287b..225a9d4 100644
--- a/debian/mauvealert-server.init
+++ b/debian/mauvealert-server.init
@@ -22,6 +22,7 @@ DAEMON=/usr/sbin/$NAME
 DAEMON_ARGS="/etc/mauvealert/$NAME.conf"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
+RUNASUSER=mauvealert
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
@@ -135,6 +136,9 @@ case "$1" in
 	do_reload
 	log_end_msg $?
 	;;
+  #
+  # This is for use by logrotate, as the post-rotate method.
+  #
   reopen-logs)
   log_daemon_msg "Re-opening logs for $DESC" "$NAME"
   do_reopenlogs
diff --git a/debian/mauvealert-server.install b/debian/mauvealert-server.install
index c23596d..f5950da 100644
--- a/debian/mauvealert-server.install
+++ b/debian/mauvealert-server.install
@@ -8,6 +8,7 @@ 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/history.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/
diff --git a/debian/mauvealert-server.logrotate b/debian/mauvealert-server.logrotate
index 3885a35..9d15453 100644
--- a/debian/mauvealert-server.logrotate
+++ b/debian/mauvealert-server.logrotate
@@ -1,4 +1,4 @@
-/var/log/mauvealert.log {
+/var/log/mauvealert/mauvealert.log {
    rotate 7
    daily
    compress
-- 
cgit v1.2.1