's!^(SpamAssassin )/home/spamd!\1/var/local/lib/spamd!1' \
$file
fi
- NOTIFY=no
- for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
- if ! test -d $dir; then
- NOTIFY=yes
- else
- dest=/var/local/lib/spamd/Maildir/.$(basename $dir)
- if test "$(readlink $dir/shared)" != "$dest"; then
- ln -sf $dest $dir/shared
- fi
+
+# This does not yet seem to be needed, and it triggers an AFS issue,
+# so I've commented it out --mwolson.
+#
+NOTIFY=no
+for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
+ if ! test -d $dir; then
+ NOTIFY=yes
+ else
+ dest=/var/local/lib/spamd/Maildir/.$(basename $dir)
+ if test "$(readlink $dir/shared)" != "$dest"; then
+ ln -sf $dest $dir/shared
fi
- done
- if test $NOTIFY = yes; then
- # This is probably going overboard, but oh well
- echo "$USER needs assistance on their shared spam dir" | \
- mail -s "[create-user] $USER needs assistance" \
- -e -a "From: admins@deleuze.hcoop.net" mwolson_admin
fi
+done
+if test $NOTIFY = yes; then
+ # This is probably going overboard, but oh well
+ echo "$USER needs assistance on their shared spam dir" | \
+ mail -s "[create-user] $USER needs assistance" \
+ -e -a "From: admins@deleuze.hcoop.net" mwolson_admin
+fi
+
else
maildirmake --add SpamAssassin=/var/local/lib/spamd/Maildir \
$HOMEPATH/Maildir
mire_and_deleuze sudo mkdir -p /var/lock/apache2/dav/$USER
mire_and_deleuze sudo chown $USER:www-data /var/lock/apache2/dav/$USER
mire_and_deleuze sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER
+
+#
+# Domtool integration
+#
+
+domtool-adduser $USER