Mercurial > hg > mlmmj

changeset 183:2ec251b9a2f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getlistaddr was tought that listaddress moved to control/listaddress mlmmj-maintd is no longer cleaning moderation/queue, now that dir is gone mlmmj-make-ml.sh now doesn't make moderation/queue mlmmj-process now uses queue for outgoing moderator mail, not modetaion/queue
author mmj
date Mon, 07 Jun 2004 04:29:13 +1000
parents 1224cdff9ef2
children 86d7d42fe996
files src/getlistaddr.c src/mlmmj-maintd.c src/mlmmj-make-ml.sh src/mlmmj-process.c
diffstat 4 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/getlistaddr.c	Mon Jun 07 04:27:25 2004 +1000
+++ b/src/getlistaddr.c	Mon Jun 07 04:29:13 2004 +1000
@@ -23,7 +23,7 @@
 	char *tmpstr;
 	int listnamefd;
 
-	tmpstr = concatstr(2, listdir, "/listaddress");;
+	tmpstr = concatstr(2, listdir, "/control/listaddress");;
 	if((listnamefd = open(tmpstr, O_RDONLY)) < 0) {
 		log_error(LOG_ARGS, "Could not open '%s'", tmpstr);
 		exit(EXIT_FAILURE);
--- a/src/mlmmj-maintd.c	Mon Jun 07 04:27:25 2004 +1000
+++ b/src/mlmmj-maintd.c	Mon Jun 07 04:29:13 2004 +1000
@@ -74,11 +74,6 @@
 			
 	free(moddirname);
 
-	moddirname = concatstr(2, listdir, "/moderation/queue");
-	delolder(moddirname, MODREQLIFE);	
-		
-	free(moddirname);
-		
 	return 0;
 }
 
--- a/src/mlmmj-make-ml.sh	Mon Jun 07 04:27:25 2004 +1000
+++ b/src/mlmmj-make-ml.sh	Mon Jun 07 04:29:13 2004 +1000
@@ -61,7 +61,7 @@
 mkdir -p $LISTDIR
 
 for DIR in incoming queue queue/discarded archive text subconf unsubconf \
-	   bounce control moderation moderation/queue subscribers.d requeue
+	   bounce control moderation subscribers.d requeue
 do
 	mkdir "$LISTDIR"/"$DIR"
 done
@@ -85,7 +85,7 @@
 fi
 
 LISTADDRESS="$LISTNAME@$FQDN"
-echo "$LISTADDRESS" > "$LISTDIR"/"listaddress"
+echo "$LISTADDRESS" > "$LISTDIR"/control/"listaddress"
 
 MLMMJRECIEVE=`which mlmmj-recieve 2>/dev/null`
 if [ -z "$MLMMJRECIEVE" ]; then
@@ -111,11 +111,13 @@
 		echo "Options was: y, Y, n or N"
 	esac
 else
+	echo
 	echo "Don't forget to add this to /etc/aliases:"
 	echo "$ALIAS"
 fi
 
-echo " ** DON'T FORGET **
+echo
+echo " ** FINAL NOTES **
 1) The mailinglist directory have to be owned by the user running the 
 mailserver (i.e. starting the binaries to work the list)
 2) To run newaliases"
--- a/src/mlmmj-process.c	Mon Jun 07 04:27:25 2004 +1000
+++ b/src/mlmmj-process.c	Mon Jun 07 04:29:13 2004 +1000
@@ -51,7 +51,7 @@
 		exit(EXIT_FAILURE);
 	}
 	free(moderatorfilename);
-	queuefilename = concatstr(3, listdir, "/moderation/queue/", randomstr);
+	queuefilename = concatstr(3, listdir, "/queue/", randomstr);
 	
 	if((queuefd = open(queuefilename, O_WRONLY|O_CREAT|O_EXCL,
 					S_IRUSR|S_IWUSR)) < 0) {
@@ -251,7 +251,7 @@
 	
 	if(do_all_the_voodo_here(rawmailfd, donemailfd, hdrfd, footfd,
 				badheaders, readhdrs, subjectprefix) < 0) {
-		log_error(LOG_ARGS, "Error in do_all_the_voodo_here.");
+		log_error(LOG_ARGS, "Error in do_all_the_voodo_here");
 		exit(EXIT_FAILURE);
 	}
 
@@ -311,8 +311,6 @@
 	if(moderated) {
 		mqueuename = concatstr(3, listdir, "/moderation/",
 				       randomstr);
-		printf("Going into moderatemode, mqueuename = [%s]\n",
-				mqueuename);
 		free(randomstr);
 		if(rename(donemailname, mqueuename) < 0) {
 			log_error(LOG_ARGS, "could not rename(%s,%s)",