X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/50f51a7879805de2b62e5b4991033a8b0ae49d58..5debfe01c15938323eafca20f3b69b8f31e69b3c:/create-user?ds=inline diff --git a/create-user b/create-user index cfe4d7a..0e999ce 100755 --- a/create-user +++ b/create-user @@ -202,23 +202,28 @@ if test -f $HOMEPATH/Maildir/shared-maildirs; then '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 - 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 + +# 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 +# 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