[Pkg-mailman-hackers] Pkg-mailman commit - rev 381 - trunk/debian
Thijs Kinkhorst
thijs at costa.debian.org
Tue Sep 19 20:50:43 UTC 2006
Author: thijs
Date: 2006-09-19 20:50:43 +0000 (Tue, 19 Sep 2006)
New Revision: 381
Added:
trunk/debian/mailman-common.mailman.init
Removed:
trunk/debian/mailman.docs
trunk/debian/mailman.examples
trunk/debian/mailman.init
Modified:
trunk/debian/mailman-common.install
trunk/debian/mailman.dirs
trunk/debian/rules
Log:
move even more to -common and delete unneeded stuff
Modified: trunk/debian/mailman-common.install
===================================================================
--- trunk/debian/mailman-common.install 2006-09-19 20:32:52 UTC (rev 380)
+++ trunk/debian/mailman-common.install 2006-09-19 20:50:43 UTC (rev 381)
@@ -1 +1,2 @@
debian/contrib/apache.conf /etc/mailman
+debian/README.Exim4.Debian /usr/share/doc/mailman
Copied: trunk/debian/mailman-common.mailman.init (from rev 370, trunk/debian/mailman.init)
===================================================================
--- trunk/debian/mailman-common.mailman.init (rev 0)
+++ trunk/debian/mailman-common.mailman.init 2006-09-19 20:50:43 UTC (rev 381)
@@ -0,0 +1,98 @@
+#! /bin/sh
+#
+# mailman starts up the master queue runner for mailman
+#
+# Based on skeleton originally by Miquel van Smoorenburg and Ian Murdock,
+# customisations by Tollef Fog Heen and Thijs Kinkhorst for Debian.
+#
+### BEGIN INIT INFO
+# Provides: mailman-qrunner
+# Required-Start: $syslog mail-transport-agent $local_fs $remote_fs $named $network
+# Required-Stop: $syslog mail-transport-agent $local_fs $remote_fs $named $network
+# Should-Start:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Mailman Master Queue Runner
+# Description: Starts and stops the Mailman queue runners, used to
+# manage the various message queues within the Mailman
+# mailing list manager.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/lib/mailman/bin/mailmanctl
+PIDFILE=/var/lib/mailman/data/master-qrunner.pid
+
+test -x $DAEMON || exit 0
+
+set -e
+
+if ! [ -d /var/run/mailman ]; then
+ install -d -o list -g list /var/run/mailman
+fi
+
+if ! [ -d /var/lock/mailman ]; then
+ install -d -o root -g list -m 2775 /var/lock/mailman
+fi
+
+. /lib/lsb/init-functions
+
+case "$1" in
+ start)
+ if /var/lib/mailman/bin/list_lists -b | fgrep -qx mailman; then
+ log_warning_msg "Site list for mailman (usually named mailman) missing."
+ log_warning_msg "Please create it; until then, mailman will refuse to start."
+ exit 0;
+ fi
+ log_daemon_msg "Starting Mailman master qrunner" "mailmanctl"
+ if $DAEMON -s -q start; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping Mailman master qrunner" "mailmanctl"
+ if $DAEMON -q stop; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ reload)
+ log_begin_msg "Reloading Mailman master qrunner configuration"
+ if $DAEMON -q restart; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ restart|force-reload)
+ PID=`cat $PIDFILE 2>/dev/null` || true
+ log_daemon_msg "Restarting Mailman master qrunner" "mailmanctl"
+ $DAEMON -q stop
+ if test -n "$PID" && kill -0 $PID 2>/dev/null ; then
+ log_action_begin_msg "Waiting"
+ for cnt in `seq 1 5`; do
+ sleep 1
+ kill -0 $PID 2>/dev/null || break
+ done;
+ if kill -0 $PID 2>/dev/null ; then
+ log_action_end_msg 1
+ else
+ log_action_end_msg 0
+ fi
+ fi
+ if $DAEMON -q start; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ *)
+ echo "Usage: /etc/init.d/mailman {start|stop|restart|reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Modified: trunk/debian/mailman.dirs
===================================================================
--- trunk/debian/mailman.dirs 2006-09-19 20:32:52 UTC (rev 380)
+++ trunk/debian/mailman.dirs 2006-09-19 20:50:43 UTC (rev 381)
@@ -2,10 +2,8 @@
usr/sbin
usr/share/lintian/overrides
usr/share/mailman
-usr/share/images/mailman
usr/lib/cgi-bin
var/log/mailman
var/lib/mailman/templates
var/lock
var/run/mailman
-etc/logrotate.d
Deleted: trunk/debian/mailman.docs
===================================================================
--- trunk/debian/mailman.docs 2006-09-19 20:32:52 UTC (rev 380)
+++ trunk/debian/mailman.docs 2006-09-19 20:50:43 UTC (rev 381)
@@ -1 +0,0 @@
-debian/README.Exim4.Debian
Deleted: trunk/debian/mailman.examples
===================================================================
Deleted: trunk/debian/mailman.init
===================================================================
--- trunk/debian/mailman.init 2006-09-19 20:32:52 UTC (rev 380)
+++ trunk/debian/mailman.init 2006-09-19 20:50:43 UTC (rev 381)
@@ -1,98 +0,0 @@
-#! /bin/sh
-#
-# mailman starts up the master queue runner for mailman
-#
-# Based on skeleton originally by Miquel van Smoorenburg and Ian Murdock,
-# customisations by Tollef Fog Heen and Thijs Kinkhorst for Debian.
-#
-### BEGIN INIT INFO
-# Provides: mailman-qrunner
-# Required-Start: $syslog mail-transport-agent $local_fs $remote_fs $named $network
-# Required-Stop: $syslog mail-transport-agent $local_fs $remote_fs $named $network
-# Should-Start:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mailman Master Queue Runner
-# Description: Starts and stops the Mailman queue runners, used to
-# manage the various message queues within the Mailman
-# mailing list manager.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/lib/mailman/bin/mailmanctl
-PIDFILE=/var/lib/mailman/data/master-qrunner.pid
-
-test -x $DAEMON || exit 0
-
-set -e
-
-if ! [ -d /var/run/mailman ]; then
- install -d -o list -g list /var/run/mailman
-fi
-
-if ! [ -d /var/lock/mailman ]; then
- install -d -o root -g list -m 2775 /var/lock/mailman
-fi
-
-. /lib/lsb/init-functions
-
-case "$1" in
- start)
- if /var/lib/mailman/bin/list_lists -b | fgrep -qx mailman; then
- log_warning_msg "Site list for mailman (usually named mailman) missing."
- log_warning_msg "Please create it; until then, mailman will refuse to start."
- exit 0;
- fi
- log_daemon_msg "Starting Mailman master qrunner" "mailmanctl"
- if $DAEMON -s -q start; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- stop)
- log_daemon_msg "Stopping Mailman master qrunner" "mailmanctl"
- if $DAEMON -q stop; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- reload)
- log_begin_msg "Reloading Mailman master qrunner configuration"
- if $DAEMON -q restart; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- restart|force-reload)
- PID=`cat $PIDFILE 2>/dev/null` || true
- log_daemon_msg "Restarting Mailman master qrunner" "mailmanctl"
- $DAEMON -q stop
- if test -n "$PID" && kill -0 $PID 2>/dev/null ; then
- log_action_begin_msg "Waiting"
- for cnt in `seq 1 5`; do
- sleep 1
- kill -0 $PID 2>/dev/null || break
- done;
- if kill -0 $PID 2>/dev/null ; then
- log_action_end_msg 1
- else
- log_action_end_msg 0
- fi
- fi
- if $DAEMON -q start; then
- log_end_msg 0
- else
- log_end_msg 1
- fi
- ;;
- *)
- echo "Usage: /etc/init.d/mailman {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2006-09-19 20:32:52 UTC (rev 380)
+++ trunk/debian/rules 2006-09-19 20:50:43 UTC (rev 381)
@@ -123,12 +123,12 @@
do dh_link usr/lib/$(package)/bin/$$bin usr/sbin/$$bin; done
mv debian/mailman/usr/sbin/arch debian/mailman/usr/sbin/mmarch
dh_installman
- dh_installinit
+ dh_installinit --name=mailman
dh_installdebconf
dh_strip
dh_compress
dh_fixperms
- chown -R root:root debian/mailman
+ chown -R root:root debian/mailman debian/mailman-common
chown -R root:list \
debian/mailman/{etc/$(package),var/lib/$(package),usr/lib/{$(package),cgi-bin/$(package)}}
chown list:list debian/mailman/var/{lock/mailman,lib/mailman/qfiles,run/mailman}
More information about the Pkg-mailman-hackers
mailing list