From: mwolson_admin Date: Mon, 22 Oct 2007 14:34:43 +0000 (-0400) Subject: Merge from CVS: create-user: use pagsh in commented-out example X-Git-Url: http://git.hcoop.net/clinton/scripts.git/commitdiff_plain/0d773e41ce96913a2362a007aa855e2fa30d3616?hp=241a0263b49eb5a72ff9d4ef14d50f351c93e1f9 Merge from CVS: create-user: use pagsh in commented-out example --- diff --git a/apache-sync-logs b/apache-sync-logs index 7c1f81e..7937d2f 100755 --- a/apache-sync-logs +++ b/apache-sync-logs @@ -20,7 +20,7 @@ for A in $(find $LOCAL_LOG_DIR/user -mindepth 3 -maxdepth 3 -print); do USER=`basename $A` PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER LOG_SRC=$A/apache/log - LOG_DEST=$AFS_USER_DIR/$PATHBITS/logs/apache/ + LOG_DEST=$AFS_USER_DIR/$PATHBITS/.logs/apache/ TMP_DEST=$LOG_SRC.tmp if [ "$VERBOSE" = "true" ]; then diff --git a/create-user b/create-user index d374f35..c6feb4c 100755 --- a/create-user +++ b/create-user @@ -221,23 +221,23 @@ if test -f $HOMEPATH/Maildir/shared-maildirs; then # 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" | \ - pagsh -c mail -s "[create-user] $USER needs assistance" \ - -e -a "From: admins@deleuze.hcoop.net" mwolson_admin -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" | \ +# pagsh -c 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 \