hcoop-git-maint: don't generate cache page

[hcoop/scripts.git] / listnew

diff --git a/listnew b/listnew
index b811ebe..1236596 100755 (executable)
--- a/listnew
+++ b/listnew
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Make a new mailing list.  Run as root on deleuze.
+# Make a new mailing list.  Run as user in sudoers on mccarthy.
 #
 # Usage: listnew LISTNAME LISTDOMAIN LISTURL USER INITIAL_PASSWORD
 
@@ -18,6 +18,10 @@ elif test -z "$5"; then
     echo "Not enough arguments"
     usage
     exit 1
+elif test "$UID" != "0"; then
+    echo "This program must be run as root"
+    usage
+    exit 1
 else
     LIST_NAME=$1
     LIST_DOMAIN=$2
@@ -26,8 +30,13 @@ else
     LIST_PASS=$5
 fi
 
-sudo -u list $BIN/newlist $LIST_NAME@$LIST_DOMAIN $LIST_USER@hcoop.net \
-    $LIST_PASS </dev/null
+# If DOMAIN is hcoop.net, force it to be lists.hcoop.net.
+if test "$LIST_DOMAIN" = "hcoop.net"; then
+    LIST_DOMAIN=lists.hcoop.net
+fi
+
+sudo -u list $BIN/newlist \
+    $LIST_NAME@$LIST_DOMAIN $LIST_USER@hcoop.net $LIST_PASS </dev/null
 
 # By default, use our list admin website for the public interface.
 # This can be changed after the user has set up their mailMan