Merge from CVS: create-user: use pagsh in commented-out example
authormwolson_admin <mwolson_admin@deleuze.hcoop.net>
Mon, 22 Oct 2007 14:34:43 +0000 (10:34 -0400)
committermwolson_admin <mwolson_admin@deleuze.hcoop.net>
Mon, 22 Oct 2007 14:34:43 +0000 (10:34 -0400)
apache-sync-logs
create-user

index 7c1f81e..7937d2f 100755 (executable)
@@ -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
index d374f35..c6feb4c 100755 (executable)
@@ -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 \