[Lunar-commits] CVS: moonbase/mail/mailman BUILD, 1.6, 1.7 CONFIGURE, 1.1, 1.2

[Jon South]

Update of /var/cvs/lunar/moonbase/mail/mailman
In directory dbguin.lunar-linux.org:/tmp/cvs-serv15551

Modified Files:
	BUILD CONFIGURE 
Log Message:
adding option for mail gid too

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/mail/mailman/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	25 May 2004 16:45:35 -0000	1.6
+++ BUILD	25 May 2004 18:37:01 -0000	1.7
@@ -6,8 +6,6 @@
   chown mailman.mailman /var/mailman 2>/dev/null
   chmod 02775 /var/mailman           2>/dev/null
 
-  MAIL_GID=$(id -g nobody)
-
   ./configure --prefix=/var/mailman            \
               --with-var-prefix=/var/mailman   \
 	      --with-username=mailman          \

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/mail/mailman/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	25 May 2004 16:39:34 -0000	1.1
+++ CONFIGURE	25 May 2004 18:37:01 -0000	1.2
@@ -1,16 +1,19 @@
 # Read the config so we can show the user what is currently set
 . $MODULE_CONFIG
 
+###############################################
+# Mailmain CGI GID
+###############################################
 GET_GID=0
 if ! grep -q "MAILMAN_GID" $MODULE_CONFIG; then
-  if query "Do you want a custom group for mailman (must match apache)?" n; then
+  if query "Do you want a custom CGI script group for the mailman (must match apache)?" n; then
     GET_GID=1
   else
     MAILMAN_GID="nogroup"
     echo "MAILMAN_GID=$MAILMAN_GID" >> $MODULE_CONFIG
   fi
 else
-  if query "Change custom group for mailman ($MAILMAN_GID)?" n; then
+  if query "Change custom CGI group for mailman ($MAILMAN_GID)?" n; then
     GET_GID=1
   fi
 fi
@@ -33,3 +36,40 @@
   done
   echo "MAILMAN_GID=$MAILMAN_GID" >> $MODULE_CONFIG
 fi
+
+###############################################
+# Mailmain MAIL GID
+###############################################
+GET_GID=0
+if ! grep -q "MAIL_GID" $MODULE_CONFIG; then
+  if query "Do you want a custom MAIL group for mailman (must match mail server)?" n; then
+    GET_GID=1
+  else
+    MAIL_GID=$(id -g nobody)
+    echo "MAIL_GID=$MAIL_GID" >> $MODULE_CONFIG
+  fi
+else
+  if query "Change custom MAIL group for mailman ($MAIL_GID)?" n; then
+    GET_GID=1
+  fi
+fi
+
+if [ "$GET_GID" == "1" ]; then
+  IS_THIS_CORRECT=0
+  while [ "$IS_THIS_CORRECT" == "0" ]; do
+    echo -en "${MODULE_COLOR}${MODULE}${DEFAULT_COLOR}:  ${QUERY_COLOR}Enter group name:${DEFAULT_COLOR} "
+    read -e MAIL_GID
+    if [ "$MAIL_GID" == "" ]; then
+      message "${MODULE_COLOR}${MODULE}:${PROBLEM_COLOR} ! Error: mailman group name cannot be blank${DEFAULT_COLOR}"
+    else
+      if ! grep "^$MAIL_GID:.*$" /etc/group; then
+        message "${MODULE_COLOR}${MODULE}:${PROBLEM_COLOR} ! WARNING: group '$MAIL_GID' does not exist.${DEFAULT_COLOR}"
+      fi
+      if query "Is '$MAIL_GID' correct?" y; then
+        IS_THIS_CORRECT=1
+      fi
+    fi
+  done
+  echo "MAIL_GID=$MAIL_GID" >> $MODULE_CONFIG
+fi
+