From 221ebe04cb5068f3a138c3d2469caf69a21058e9 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2010 22:20:07 +0000
Subject: [PATCH] Bugfixes etc.

---
 crontab.part.INO        |  2 +-
 forward-slimy.part.INO  |  4 ++--
 forward-suffix.part.INO |  2 --
 inews.INO               |  2 +-
 install-aggregates      |  5 ++---
 install-loggroups       | 18 ++++++++++++++++++
 install-newsgroup       |  2 ++
 setup                   |  1 +
 stump/etc/modenv.INO    |  0
 9 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100755 install-loggroups
 mode change 100644 => 100755 stump/etc/modenv.INO

diff --git a/crontab.part.INO b/crontab.part.INO
index 48b5c68..71caf31 100644
--- a/crontab.part.INO
+++ b/crontab.part.INO
@@ -1,6 +1,6 @@
 #
 # install with
-#  ssh webstump@chiark live/crontab-install
+#  ssh webstump@chiark live-mtm/install-aggregates
 #
 #m h  d m dow
 50 7  * * 1,4	savelog live-%ABBREV%/xlog/log/%GROUP%/event.log
diff --git a/forward-slimy.part.INO b/forward-slimy.part.INO
index a4f6ec8..059e462 100644
--- a/forward-slimy.part.INO
+++ b/forward-slimy.part.INO
@@ -2,8 +2,8 @@ if $local_part_suffix is +%ABBREV%+%KEYSUBMIT%
 or $local_part_suffix is +%ABBREV%+test-submission
 then
 	unseen pipe "mail -s submission %LOGGROUPEMAILPREFIX%+%ABBREV%+log+submissions"
-	unseen pipe "/home/webstump/live/xlog/bin/record submission %GROUP%"
-	pipe "/home/webstump/live/stump/etc/modenv stump.pl submission.pl"
+	unseen pipe "%BASEDIR%/xlog/bin/record submission %GROUP%"
+	pipe "%BASEDIR%/stump/etc/modenv stump.pl submission.pl"
 	finish
 endif
 
diff --git a/forward-suffix.part.INO b/forward-suffix.part.INO
index c15f009..def37b3 100644
--- a/forward-suffix.part.INO
+++ b/forward-suffix.part.INO
@@ -39,5 +39,3 @@ then
 	seen deliver %ABBREV%-rejections@chiark.greenend.org.uk
 	finish
 endif
-
-unseen finish
diff --git a/inews.INO b/inews.INO
index a2bbc54..1b8892f 100644
--- a/inews.INO
+++ b/inews.INO
@@ -31,7 +31,7 @@ set -e
 if [ $rc = 0 ]
 then
 	echo 'posted ok!'
- 	$HOME/live/xlog/bin/record posted %GROUP% <$tf
+ 	%BASEDIR%/xlog/bin/record posted %GROUP% <$tf
  	exit 0
 fi
 
diff --git a/install-aggregates b/install-aggregates
index 41856f9..24052cc 100755
--- a/install-aggregates
+++ b/install-aggregates
@@ -15,9 +15,7 @@ if [ x"`whoami`" != x"$OURUSER" ]; then
 	exit 0
 fi
 
-fall-over-now
-
-for f in	crontab forward-suffix forward-slimy mailinglists_dir
+for f in	crontab forward-suffix forward-slimy
 do
 	d=$f
 	g=$f.combined
@@ -30,6 +28,7 @@ do
 	echo '# autogenerated - do not edit' >>$g
 	if test -f $f.part; then cat $f.part >>$g; fi
 	cat live-*/$f.part >>$g
+	if test -f $f.part-tail; then cat $f.part-tail >>$g; fi
 
 	mv -f $g $d
 	case $f in
diff --git a/install-loggroups b/install-loggroups
new file mode 100755
index 0000000..d484a9a
--- /dev/null
+++ b/install-loggroups
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+. ./get-settings
+
+case ",$NEWSADMINUSERS," in
+*,"`whoami`",*) ;;
+*)	echo >&2 "$0 must be run as one of $NEWSADMINUSERS, skipping"
+esac
+
+exec <mailinglists_dir.part
+while read alias group; do
+	ctlinnd newgroup $group y
+done
+
+cd ..
+cat live-*/mailinglists_dir.part >$MAILINGLISTSDIR.new
+mv -f $MAILINGLISTSDIR.new $MAILINGLISTSDIR
diff --git a/install-newsgroup b/install-newsgroup
index 1eb261f..ff1513b 100755
--- a/install-newsgroup
+++ b/install-newsgroup
@@ -5,6 +5,8 @@ set -e
 . ../global-settings
 . persistent-autosettings
 
+mkdir -p stump/tmp/messages
+mkdir -p stump/data
 mkdir -p webstump/queues/$GROUP
 mkdir -p xlog/log/$GROUP
 
diff --git a/setup b/setup
index 032af1c..2a7c2c0 100755
--- a/setup
+++ b/setup
@@ -14,6 +14,7 @@ x ./install-newsgroup
 x ./install-substitutions
 x make -C webstump
 x ./install-aggregates
+x ./install-loggroups
 
 echo ==== DONE ====
 
diff --git a/stump/etc/modenv.INO b/stump/etc/modenv.INO
old mode 100644
new mode 100755
-- 
2.30.2