Bugfixes etc.

diff --git a/crontab.part.INO b/crontab.part.INO
index 48b5c681fc4c3c81271029c0f79dcec89f0ee888..71caf315b9dcbbae16d00e24b354ed4356b9d2d5 100644 (file)
--- 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 a4f6ec81ff1806f139cf7eaffadbdfa743e7ccf4..059e4622387bfaa42fc5ae6b5c3099d7bbf661ef 100644 (file)
--- 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 c15f009435b9da1a0aa82c0962062d56afa903ab..def37b370ba12087b1299fb1eb85faf5c7146fc2 100644 (file)
--- 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 a2bbc546091f0514a4e52ee6c5e59974053316ea..1b8892ff383818808a65b26d06bb3aee284d83ba 100644 (file)
--- 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 41856f973a463840d30a682a919434189c101b4f..24052cc5a1c26ec17b74064cd142bae81ae65dac 100755 (executable)
--- 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 (executable)
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 1eb261f6ea7a7f504256dab1b3b21a4f36850257..ff1513b55f18831d83caf7baf4e18b63f1ac39e5 100755 (executable)
--- 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 032af1cd3d7a42fdb9bb533c73315e1fb45179ef..2a7c2c08acdc32a9c7d7ac6dfe9c92db8955691c 100755 (executable)
--- 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 (file)
new mode 100755 (executable)