CVS: tmda/TMDA ChangeLog,1.273,1.274 Defaults.py,1.180,1.181 Pending.py,1.20,1.21

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv20154/TMDA

Modified Files:
	ChangeLog Defaults.py Pending.py 
Log Message:
PENDING_DIR, a new variable which defines the full path to the pending
queue directory.  Some setups may want to share the pending queue, but
not the rest of DATADIR.  Default is DATADIR/pending


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- ChangeLog	25 May 2003 06:30:31 -0000	1.273
+++ ChangeLog	26 May 2003 00:43:05 -0000	1.274
@@ -1,3 +1,10 @@
+2003-05-25  Jason R. Mastaler  <[email protected]>
+
+	* Defaults.py (PENDING_DIR): New variable.
+
+	* Pending.py (Queue.initQueue): Use Defaults.PENDING_DIR.
+	(Message.__init__): Ditto.
+
 2003-05-24  Jason R. Mastaler  <[email protected]>
 
 	* Defaults.py (CGI_VIRTUALUSER): New variable.

Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- Defaults.py	25 May 2003 05:14:21 -0000	1.180
+++ Defaults.py	26 May 2003 00:43:05 -0000	1.181
@@ -1054,6 +1054,19 @@
 if MYSQL_ENABLED and not vars().has_key('MYSQL_PASSWORD'):
     MYSQL_PASSWORD = ""
 
+# PENDING_DIR
+# Full path to the directory containing messages pending confirmation
+# (aka, the "pending queue").  If this directory doesn't exist, it
+# will automatically be created by TMDA with 0700 permissions when the
+# first message arrives.
+#
+# Example:
+# PENDING_DIR = "/full/path/to/pending/"
+#
+# Default is ~/.tmda/pending/
+if not vars().has_key('PENDING_DIR'):
+    PENDING_DIR = os.path.join(DATADIR, 'pending')
+
 # PENDING_LIFETIME
 # A time interval describing how long a message can live in the
 # pending queue before it's subject to automated deletion by
@@ -1103,7 +1116,7 @@
 #
 # Default is ~/.tmda/pending/.msgcache
 if not vars().has_key('PENDING_CACHE'):
-    PENDING_CACHE = os.path.join(DATADIR, 'pending', '.msgcache')
+    PENDING_CACHE = os.path.join(PENDING_DIR, '.msgcache')
     
 # PENDING_CACHE_LEN
 # An integer which specifies the maximum number of entries held by

Index: Pending.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Pending.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Pending.py	19 May 2003 17:59:39 -0000	1.20
+++ Pending.py	26 May 2003 00:43:05 -0000	1.21
@@ -71,7 +71,7 @@
 
     def initQueue(self):
         """Initialize the queue with the given parameters (see __init__)."""
-        self.pendingdir = os.path.join(Defaults.DATADIR, 'pending')
+        self.pendingdir = Defaults.PENDING_DIR
         if not os.path.exists(self.pendingdir):
             raise Errors.QueueError, 'Pending directory %s does not exist, exiting.' % self.pendingdir
     
@@ -415,7 +415,7 @@
     confirm_accept_address = None
     def __init__(self, msgid, recipient = None):
         self.msgid = msgid
-        self.msgfile = os.path.join(Defaults.DATADIR, 'pending', self.msgid)
+        self.msgfile = os.path.join(Defaults.PENDING_DIR, self.msgid)
         if not os.path.exists(self.msgfile):
             raise Errors.MessageError, '%s not found!' % self.msgid
         try:

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs