Update of /cvsroot/tmda/tmda/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv9265/contrib
Modified Files:
vadduser-tmda vtmdarc
Log Message:
vadduser-tmda improvements from Cory Wright
Index: vadduser-tmda
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/vadduser-tmda,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vadduser-tmda 14 Feb 2003 02:26:47 -0000 1.1
+++ vadduser-tmda 12 Mar 2003 21:49:16 -0000 1.2
@@ -86,19 +86,26 @@
VUSERNAME=`echo $EMAILADDR | cut -d@ -f1`
VDOMAIN=`echo $EMAILADDR | cut -d@ -f2`
VDOMDIR=`vdominfo -d $VDOMAIN`
+python -c 'import cdb' 2> /dev/null
+CDB=""
+cdbcheckret=$?
+if [ $cdbcheckret = "0" ]; then
+ CDB="-autocdb"
+fi
# Create all the necessary directories and files.
mkdir -p $VUSERDIR/.tmda/filters $VUSERDIR/.tmda/lists
mkdir -p $VUSERDIR/.tmda/pending $VUSERDIR/.tmda/responses
touch $VUSERDIR/.tmda/filters/incoming $VUSERDIR/.tmda/filters/outgoing
touch $VUSERDIR/.tmda/lists/whitelist $VUSERDIR/.tmda/config
+echo "from-file $CDB $VUSERDIR/.tmda/lists/whitelist ok" >>
$VUSERDIR/.tmda/filters/incoming
cp -R $TMDAROOT/templates $VUSERDIR/.tmda/
tmda-keygen -b > $VUSERDIR/.tmda/crypt_key
chmod 600 $VUSERDIR/.tmda/crypt_key
# Create the .qmail files.
cat <<VEOF > $VDOMDIR/.qmail-${VUSERNAME}
-|preline -f $TMDAROOT/bin/tmda-rfilter -c $VUSERDIR/.tmda/config
+|preline -f $TMDAROOT/bin/tmda-filter -c $VUSERDIR/.tmda/config -t
$VUSERDIR/.tmda/templates/
|$VPOPROOT/bin/vdelivermail '' $VUSERDIR
VEOF
ln -s $VDOMDIR/.qmail-${VUSERNAME} $VDOMDIR/.qmail-${VUSERNAME}-default
Index: vtmdarc
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/vtmdarc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vtmdarc 14 Feb 2003 02:26:47 -0000 1.1
+++ vtmdarc 12 Mar 2003 21:49:17 -0000 1.2
@@ -1,2 +1,3 @@
CRYPT_KEY_FILE = "$VUSERDIR/.tmda/crypt_key"
+CONFIRM_APPEND = "$VUSERDIR/.tmda/lists/whitelist"
DATADIR = "$VUSERDIR/.tmda/"
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
