CVS: tmda/htdocs config-vars.ht, 1.45, 1.46 config-vars.html, 1.87, 1.88 tmda-vdomains.ht, 1.5, 1.6 tmda-vdomains.html, 1.27, 1.28
"Jason R. Mastaler" <[email protected]> Thu, 05 Feb 2004 17:21:17 -0800
| Newsgroups | gmane.mail.spam.tmda.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tmda/tmda/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25144/htdocs
Modified Files:
config-vars.ht config-vars.html tmda-vdomains.ht
tmda-vdomains.html
Log Message:
New feature. Run config variables that contain a pathname through
os.path.expandusers(). This allows users to use the more intuitive
"~/foo" style string value in their ~/.tmda/config instead of having
to wrap the values in os.path.expandusers() themselves. e.g,
TEMPLATE_DIR = "~/.tmda/templates"
BARE_APPEND = "~/.tmda/.tmda/lists/whitelist"
Such variables are stored in a dict at the end of Defaults.py
called _path_vars.
Index: config-vars.ht
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/config-vars.ht,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- config-vars.ht 5 Feb 2004 22:15:53 -0000 1.45
+++ config-vars.ht 6 Feb 2004 01:21:14 -0000 1.46
@@ -511,9 +511,10 @@
automatically appended if the outgoing <action> is in the form
'bare=append'.
<br><br>
-Example:
+Examples:
<br><br>
-<code>BARE_APPEND = "/full/path/to/whitelist"</code>
+<code>BARE_APPEND = "/full/path/to/whitelist"</code><br>
+<code>BARE_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -592,9 +593,10 @@
Filename for saving various tmda-cgi settings. This filename can
include a full path, otherwise it is relative the user's config file.
<br><br>
-Example:
+Examples:
<br><br>
-<code>CGI_SETTINGS = "/home/jim/.tmda/MyCGISettings"</code>
+<code>CGI_SETTINGS = "/home/jim/.tmda/MyCGISettings"</code><br>
+<code>CGI_SETTINGS = "~/.tmda/MyCGISettings"</code>
<br><br>
Default is "tmda-cgi.ini".
<dt><hr>
@@ -688,9 +690,10 @@
appended once they confirm a message. This can be used to implement
"auto-whitelisting" functionality.
<br><br>
-Example:
+Examples:
<br><br>
-<code>CONFIRM_APPEND = "/full/path/to/whitelist"</code>
+<code>CONFIRM_APPEND = "/full/path/to/whitelist"</code><br>
+<code>CONFIRM_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -727,6 +730,11 @@
directories. TMDA should be free to create files and directories
under DATADIR if need be. Make sure to include a trailing "/".
<br><br>
+Examples:
+<br><br>
+<code>DATADIR = "/full/path/to/.tmda/"</code><br>
+<code>DATADIR = "~/.tmda/"</code>
+<br><br>
Default is ~/.tmda/
<dt><hr>
<a name="DATED_TEMPLATE_VARS"><h4>DATED_TEMPLATE_VARS</h4></a>
@@ -961,9 +969,10 @@
<dd>
Filename which uncaught exceptions should be written to.
<br><br>
-Example:
+Examples:
<br><br>
-<code>LOGFILE_DEBUG = "/path/to/logs/tmda.debug"</code>
+<code>LOGFILE_DEBUG = "/path/to/logs/tmda.debug"</code><br>
+<code>LOGFILE_DEBUG = "~/.tmda/logs/debug"</code>
<br><br>
No default.
<dt><hr>
@@ -972,9 +981,10 @@
Filename which incoming delivery (i.e, tmda-filter) summaries should
be written to.
<br><br>
-Example:
+Examples:
<br><br>
-<code>LOGFILE_INCOMING = "/path/to/logs/tmda.in"</code>
+<code>LOGFILE_INCOMING = "/path/to/logs/tmda.in"</code><br>
+<code>LOGFILE_INCOMING = "~/.tmda/logs/incoming"</code>
<br><br>
No default.
<dt><hr>
@@ -983,9 +993,10 @@
Filename which outgoing message (i.e, tmda-sendmail) summaries
should be written to.
<br><br>
-Example:
+Examples:
<br><br>
-<code>LOGFILE_OUTGOING = "/path/to/logs/tmda.out"</code>
+<code>LOGFILE_OUTGOING = "/path/to/logs/tmda.out"</code><br>
+<code>LOGFILE_OUTGOING = "~/.tmda/logs/outgoing"</code>
<br><br>
No default.
<dt><hr>
@@ -1008,7 +1019,7 @@
Examples:
<br><br>
<code>MAIL_FOLLOWUP_TO = "/path/to/lists.txt"</code><br>
-<code>MAIL_FOLLOWUP_TO = os.path.expanduser("~/.lists")</code><br>
+<code>MAIL_FOLLOWUP_TO = "~/.lists"</code><br>
<code>MAIL_FOLLOWUP_TO = ["[email protected]", "[email protected]"]</code>
<br><br>
No default.
@@ -1089,9 +1100,10 @@
Filename to which a sender's e-mail address should be appended
when a message is "blacklisted" by tmda-pending.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_BLACKLIST_APPEND = "/full/path/to/blacklist"</code>
+<code>PENDING_BLACKLIST_APPEND = "/full/path/to/blacklist"</code><br>
+<code>PENDING_BLACKLIST_APPEND = "~/.tmda/lists/blacklist"</code>
<br><br>
No default
<dt><hr>
@@ -1142,9 +1154,10 @@
automated pending queue cleanup feature (see PENDING_CLEANUP_ODDS)
also respects this setting.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_DELETE_APPEND = "/full/path/to/blacklist"</code>
+<code>PENDING_DELETE_APPEND = "/full/path/to/blacklist"</code><br>
+<code>PENDING_DELETE_APPEND = "~/.tmda/lists/blacklist"</code>
<br><br>
No default
<dt><hr>
@@ -1155,10 +1168,6 @@
will automatically be created by TMDA with 0700 permissions when the
first message arrives.
<br><br>
-Example:
-<br><br>
-<code>PENDING_DIR = "/full/path/to/pending/"</code>
-<br><br>
Default is ~/.tmda/pending/
<dt><hr>
<a name="PENDING_LIFETIME"><h4>PENDING_LIFETIME</h4></a>
@@ -1183,9 +1192,10 @@
Filename to which a sender's e-mail address should be automatically
appended when a message is "released" by tmda-pending.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_RELEASE_APPEND = "/full/path/to/whitelist"</code>
+<code>PENDING_RELEASE_APPEND = "/full/path/to/whitelist"</code><br>
+<code>PENDING_RELEASE_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -1194,9 +1204,10 @@
Filename to which a sender's e-mail address should be appended
when a message is "whitelisted" by tmda-pending.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_WHITELIST_APPEND = "/full/path/to/whitelist"</code>
+<code>PENDING_WHITELIST_APPEND = "/full/path/to/whitelist"</code><br>
+<code>PENDING_WHITELIST_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -1340,10 +1351,6 @@
Full path to a directory containing auto-response rate-limiting
information. Only consulted if MAX_AUTORESPONSES_PER_DAY != 0
<br><br>
-Example:
-<br><br>
-<code>RESPONSE_DIR = "/full/path/to/responses/"</code>
-<br><br>
Default is ~/.tmda/responses
<dt><hr>
<a name="SENDER_TEMPLATE_VARS"><h4>SENDER_TEMPLATE_VARS</h4></a>
@@ -1358,7 +1365,8 @@
The path to the sendmail program, or sendmail compatibility
interface when MAIL_TRANSPORT is "sendmail".
<br><br>
-Defaults to one of the two standard locations.
+Defaults to one of the two standard locations (/usr/lib/sendmail,
+/usr/sbin/sendmail).
<dt><hr>
<a name="SMTPAUTH_PASSWORD"><h4>SMTPAUTH_PASSWORD</h4></a>
<dd>
@@ -1503,9 +1511,10 @@
templates found in this directory will be used, otherwise the
default templates will be used.
<br><br>
-Example:
+Examples:
<br><br>
-<code>TEMPLATE_DIR = "/full/path/to/templates/"</code>
+<code>TEMPLATE_DIR = "/full/path/to/templates/"</code><br>
+<code>TEMPLATE_DIR = "~/.tmda/templates/"</code>
<br><br>
No default.
<dt><hr>
Index: config-vars.html
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/config-vars.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- config-vars.html 5 Feb 2004 22:15:53 -0000 1.87
+++ config-vars.html 6 Feb 2004 01:21:14 -0000 1.88
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<!-- THIS PAGE IS AUTOMATICALLY GENERATED. DO NOT EDIT. -->
-<!-- Thu Feb 5 15:13:56 2004 -->
+<!-- Thu Feb 5 18:18:23 2004 -->
<!-- USING HT2HTML 2.0 -->
<!-- SEE http://ht2html.sf.net -->
<!-- User-specified headers:
@@ -719,9 +719,10 @@
automatically appended if the outgoing <action> is in the form
'bare=append'.
<br><br>
-Example:
+Examples:
<br><br>
-<code>BARE_APPEND = "/full/path/to/whitelist"</code>
+<code>BARE_APPEND = "/full/path/to/whitelist"</code><br>
+<code>BARE_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -800,9 +801,10 @@
Filename for saving various tmda-cgi settings. This filename can
include a full path, otherwise it is relative the user's config file.
<br><br>
-Example:
+Examples:
<br><br>
-<code>CGI_SETTINGS = "/home/jim/.tmda/MyCGISettings"</code>
+<code>CGI_SETTINGS = "/home/jim/.tmda/MyCGISettings"</code><br>
+<code>CGI_SETTINGS = "~/.tmda/MyCGISettings"</code>
<br><br>
Default is "tmda-cgi.ini".
<dt><hr>
@@ -896,9 +898,10 @@
appended once they confirm a message. This can be used to implement
"auto-whitelisting" functionality.
<br><br>
-Example:
+Examples:
<br><br>
-<code>CONFIRM_APPEND = "/full/path/to/whitelist"</code>
+<code>CONFIRM_APPEND = "/full/path/to/whitelist"</code><br>
+<code>CONFIRM_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -935,6 +938,11 @@
directories. TMDA should be free to create files and directories
under DATADIR if need be. Make sure to include a trailing "/".
<br><br>
+Examples:
+<br><br>
+<code>DATADIR = "/full/path/to/.tmda/"</code><br>
+<code>DATADIR = "~/.tmda/"</code>
+<br><br>
Default is ~/.tmda/
<dt><hr>
<a name="DATED_TEMPLATE_VARS"><h4>DATED_TEMPLATE_VARS</h4></a>
@@ -1169,9 +1177,10 @@
<dd>
Filename which uncaught exceptions should be written to.
<br><br>
-Example:
+Examples:
<br><br>
-<code>LOGFILE_DEBUG = "/path/to/logs/tmda.debug"</code>
+<code>LOGFILE_DEBUG = "/path/to/logs/tmda.debug"</code><br>
+<code>LOGFILE_DEBUG = "~/.tmda/logs/debug"</code>
<br><br>
No default.
<dt><hr>
@@ -1180,9 +1189,10 @@
Filename which incoming delivery (i.e, tmda-filter) summaries should
be written to.
<br><br>
-Example:
+Examples:
<br><br>
-<code>LOGFILE_INCOMING = "/path/to/logs/tmda.in"</code>
+<code>LOGFILE_INCOMING = "/path/to/logs/tmda.in"</code><br>
+<code>LOGFILE_INCOMING = "~/.tmda/logs/incoming"</code>
<br><br>
No default.
<dt><hr>
@@ -1191,9 +1201,10 @@
Filename which outgoing message (i.e, tmda-sendmail) summaries
should be written to.
<br><br>
-Example:
+Examples:
<br><br>
-<code>LOGFILE_OUTGOING = "/path/to/logs/tmda.out"</code>
+<code>LOGFILE_OUTGOING = "/path/to/logs/tmda.out"</code><br>
+<code>LOGFILE_OUTGOING = "~/.tmda/logs/outgoing"</code>
<br><br>
No default.
<dt><hr>
@@ -1216,7 +1227,7 @@
Examples:
<br><br>
<code>MAIL_FOLLOWUP_TO = "/path/to/lists.txt"</code><br>
-<code>MAIL_FOLLOWUP_TO = os.path.expanduser("~/.lists")</code><br>
+<code>MAIL_FOLLOWUP_TO = "~/.lists"</code><br>
<code>MAIL_FOLLOWUP_TO = ["[email protected]", "[email protected]"]</code>
<br><br>
No default.
@@ -1297,9 +1308,10 @@
Filename to which a sender's e-mail address should be appended
when a message is "blacklisted" by tmda-pending.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_BLACKLIST_APPEND = "/full/path/to/blacklist"</code>
+<code>PENDING_BLACKLIST_APPEND = "/full/path/to/blacklist"</code><br>
+<code>PENDING_BLACKLIST_APPEND = "~/.tmda/lists/blacklist"</code>
<br><br>
No default
<dt><hr>
@@ -1350,9 +1362,10 @@
automated pending queue cleanup feature (see PENDING_CLEANUP_ODDS)
also respects this setting.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_DELETE_APPEND = "/full/path/to/blacklist"</code>
+<code>PENDING_DELETE_APPEND = "/full/path/to/blacklist"</code><br>
+<code>PENDING_DELETE_APPEND = "~/.tmda/lists/blacklist"</code>
<br><br>
No default
<dt><hr>
@@ -1363,10 +1376,6 @@
will automatically be created by TMDA with 0700 permissions when the
first message arrives.
<br><br>
-Example:
-<br><br>
-<code>PENDING_DIR = "/full/path/to/pending/"</code>
-<br><br>
Default is ~/.tmda/pending/
<dt><hr>
<a name="PENDING_LIFETIME"><h4>PENDING_LIFETIME</h4></a>
@@ -1391,9 +1400,10 @@
Filename to which a sender's e-mail address should be automatically
appended when a message is "released" by tmda-pending.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_RELEASE_APPEND = "/full/path/to/whitelist"</code>
+<code>PENDING_RELEASE_APPEND = "/full/path/to/whitelist"</code><br>
+<code>PENDING_RELEASE_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -1402,9 +1412,10 @@
Filename to which a sender's e-mail address should be appended
when a message is "whitelisted" by tmda-pending.
<br><br>
-Example:
+Examples:
<br><br>
-<code>PENDING_WHITELIST_APPEND = "/full/path/to/whitelist"</code>
+<code>PENDING_WHITELIST_APPEND = "/full/path/to/whitelist"</code><br>
+<code>PENDING_WHITELIST_APPEND = "~/.tmda/lists/whitelist"</code>
<br><br>
No default
<dt><hr>
@@ -1548,10 +1559,6 @@
Full path to a directory containing auto-response rate-limiting
information. Only consulted if MAX_AUTORESPONSES_PER_DAY != 0
<br><br>
-Example:
-<br><br>
-<code>RESPONSE_DIR = "/full/path/to/responses/"</code>
-<br><br>
Default is ~/.tmda/responses
<dt><hr>
<a name="SENDER_TEMPLATE_VARS"><h4>SENDER_TEMPLATE_VARS</h4></a>
@@ -1566,7 +1573,8 @@
The path to the sendmail program, or sendmail compatibility
interface when MAIL_TRANSPORT is "sendmail".
<br><br>
-Defaults to one of the two standard locations.
+Defaults to one of the two standard locations (/usr/lib/sendmail,
+/usr/sbin/sendmail).
<dt><hr>
<a name="SMTPAUTH_PASSWORD"><h4>SMTPAUTH_PASSWORD</h4></a>
<dd>
@@ -1711,9 +1719,10 @@
templates found in this directory will be used, otherwise the
default templates will be used.
<br><br>
-Example:
+Examples:
<br><br>
-<code>TEMPLATE_DIR = "/full/path/to/templates/"</code>
+<code>TEMPLATE_DIR = "/full/path/to/templates/"</code><br>
+<code>TEMPLATE_DIR = "~/.tmda/templates/"</code>
<br><br>
No default.
<dt><hr>
Index: tmda-vdomains.ht
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/tmda-vdomains.ht,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tmda-vdomains.ht 19 Dec 2003 20:35:02 -0000 1.5
+++ tmda-vdomains.ht 6 Feb 2004 01:21:14 -0000 1.6
@@ -247,8 +247,8 @@
<code>
import os<br>
<br>
-BARE_APPEND = os.path.expanduser("~/.tmda/whitelist")<br>
-CONFIRM_APPEND = os.path.expanduser("~/.tmda/whitelist")
+BARE_APPEND = "~/.tmda/whitelist"<br>
+CONFIRM_APPEND = "~/.tmda/whitelist"
</code>
<p>
@@ -335,8 +335,8 @@
<code>
import os<br>
<br>
-BARE_APPEND = os.path.expanduser("~/.tmda/whitelist")<br>
-CONFIRM_APPEND = os.path.expanduser("~/.tmda/whitelist")
+BARE_APPEND = "~/.tmda/whitelist"<br>
+CONFIRM_APPEND = "~/.tmda/whitelist"
</code>
<p>
Index: tmda-vdomains.html
===================================================================
RCS file: /cvsroot/tmda/tmda/htdocs/tmda-vdomains.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tmda-vdomains.html 5 Feb 2004 22:15:53 -0000 1.27
+++ tmda-vdomains.html 6 Feb 2004 01:21:14 -0000 1.28
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<!-- THIS PAGE IS AUTOMATICALLY GENERATED. DO NOT EDIT. -->
-<!-- Thu Feb 5 15:14:00 2004 -->
+<!-- Thu Feb 5 17:38:17 2004 -->
<!-- USING HT2HTML 2.0 -->
<!-- SEE http://ht2html.sf.net -->
<!-- User-specified headers:
@@ -455,8 +455,8 @@
<code>
import os<br>
<br>
-BARE_APPEND = os.path.expanduser("~/.tmda/whitelist")<br>
-CONFIRM_APPEND = os.path.expanduser("~/.tmda/whitelist")
+BARE_APPEND = "~/.tmda/whitelist"<br>
+CONFIRM_APPEND = "~/.tmda/whitelist"
</code>
<p>
@@ -543,8 +543,8 @@
<code>
import os<br>
<br>
-BARE_APPEND = os.path.expanduser("~/.tmda/whitelist")<br>
-CONFIRM_APPEND = os.path.expanduser("~/.tmda/whitelist")
+BARE_APPEND = "~/.tmda/whitelist"<br>
+CONFIRM_APPEND = "~/.tmda/whitelist"
</code>
<p>