[Pkg-mailman-hackers] Pkg-mailman commit - rev 16 - in trunk/debian: . po
Laszlo Boszormenyi
gcs-guest@haydn.debian.org
Sun, 14 Mar 2004 13:58:59 -0700
Author: gcs-guest
Date: 2004-03-14 13:58:57 -0700 (Sun, 14 Mar 2004)
New Revision: 16
Modified:
trunk/debian/changelog
trunk/debian/config
trunk/debian/po/templates.pot
trunk/debian/postinst
trunk/debian/templates
Log:
Revert the accidental gate_news change
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-14 20:50:03 UTC (rev 15)
+++ trunk/debian/changelog 2004-03-14 20:58:57 UTC (rev 16)
@@ -12,6 +12,7 @@
* Wait for termination on restart|force-reload (by GCS,
closes: #231468, #204006, #224012)
* Fix --purge, thanks to Lionel Elie Mamane and Tollef (by GCS)
+ * Revert gate_news changes (by GCS, closes: #237006)
-- Tollef Fog Heen <tfheen@debian.org> Wed, 11 Feb 2004 02:11:04 +0100
Modified: trunk/debian/config
===================================================================
--- trunk/debian/config 2004-03-14 20:50:03 UTC (rev 15)
+++ trunk/debian/config 2004-03-14 20:58:57 UTC (rev 16)
@@ -2,6 +2,15 @@
. /usr/share/debconf/confmodule
+if [ -f "/etc/cron.d/mailman" ]; then
+ COMMENT=`awk '/^.*gate_news/ { print substr($1,1,1) } ' < /etc/cron.d/mailman`
+ if [ "$COMMENT" = "#" ]; then
+ db_set mailman/gate_news no
+ else
+ db_set mailman/gate_news yes
+ fi
+fi
+
if [ ! -e /etc/mailman/mm_cfg.py -o ! -x /var/lib/mailman/bin/list_lists ] || \
[ "$(/var/lib/mailman/bin/list_lists -b | grep ^mailman$ )" = "" ]; then
db_input critical mailman/create_site_list || true
Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot 2004-03-14 20:50:03 UTC (rev 15)
+++ trunk/debian/po/templates.pot 2004-03-14 20:58:57 UTC (rev 16)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-30 12:12+0100\n"
+"POT-Creation-Date: 2003-12-06 15:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,15 +24,35 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Gate news to mail?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid ""
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:4
+msgid "Most people won't need this."
+msgstr ""
+
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:12
msgid "Missing site list"
msgstr ""
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:12
msgid ""
"Mailman needs a so-called \"site list\", which is the list from which "
"password reminders and such are sent out from. This list needs to be "
@@ -41,7 +61,7 @@
#. Type: note
#. Description
-#: ../templates:3
+#: ../templates:12
msgid ""
"To create the list, run \"newlist mailman\" and follow the instructions on-"
"screen. Note that you also need to start mailman after that, using /etc/"
Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2004-03-14 20:50:03 UTC (rev 15)
+++ trunk/debian/postinst 2004-03-14 20:58:57 UTC (rev 16)
@@ -4,10 +4,6 @@
# Written 1998 by Gregor Hoffleit <flight@debian.org>.
# Updated 2001 by Tollef Fog Heen <tfheen@debian.org>
#
-
-# workaround for debconf bug -- save stdin in fd 52 (restore after db_stop)
-# if we arn't given the chance, try /dev/tty
-
. /usr/share/debconf/confmodule
PACKAGE=mailman
@@ -36,6 +32,11 @@
# 5 AM on the first of each month, mail out password reminders.
0 5 1 * * list /usr/lib/mailman/cron/mailpasswds
#
+# Every 5 mins, try to gate news to mail. You can comment this one out
+# if you don't want to allow gating, or don't have any going on right now,
+# or want to exclusively use a callback strategy instead of polling.
+# 0,5,10,15,20,25,30,35,40,45,50,55 * * * * list /usr/lib/mailman/cron/gate_news
+#
# At 3:27am every night, regenerate the gzip'd archive file. Only
# turn this on if the internal archiver is used and
# GZIP_ARCHIVE_TXT_FILES is false in mm_cfg.py
@@ -102,8 +103,14 @@
fi
done
- # Comment out any lines containing the words "gate_news"
- awk '/^[^#]*gate_news/ { print "# " $LINE;next }; //' < /etc/cron.d/mailman > /etc/cron.d/mailman.$$
+ db_get mailman/gate_news || true
+ if [ "$RET" = "no" ]; then
+ # Comment out any lines containing the words "gate_news"
+ awk '/^[^#]*gate_news/ { print "# " $LINE;next }; //' < /etc/cron.d/mailman > /etc/cron.d/mailman.$$
+ else
+ # Remove commenting of any lines containing gate_news
+ awk '/^[ \t]*#.*gate_news/ { sub(/^[ \t]*#[ \t]*/, ""); print; next }; //' < /etc/cron.d/mailman > /etc/cron.d/mailman.$$
+ fi
mv -f /etc/cron.d/mailman.$$ /etc/cron.d/mailman
if [ -e /etc/mailman/mm_cfg.py ]; then
Modified: trunk/debian/templates
===================================================================
--- trunk/debian/templates 2004-03-14 20:50:03 UTC (rev 15)
+++ trunk/debian/templates 2004-03-14 20:58:57 UTC (rev 16)
@@ -1,3 +1,12 @@
+Template: mailman/gate_news
+Type: boolean
+Default: false
+_Description: Gate news to mail?
+ Do you want to gate news to mail, that is, send all the messages which
+ appear in a newsgroup to a mailing list.
+ .
+ Most people won't need this.
+
Template: mailman/create_site_list
Type: note
_Description: Missing site list