-#!/bin/bash
-
-# invoke this as root on mire
-
-exec 2>&1
-
-# drop any tokens; use only users' cgi tokens
-kdestroy
-unlog
-
-LOCAL_LOG_DIR=/var/log/apache
-
-for A in $LOCAL_LOG_DIR/user/?/??/*; do \
- USER=`basename $A`
- PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
- LOG_DEST=/afs/hcoop.net/user/$PATHBITS/logs/apache/
-
- echo
- echo "=============================================================================="
- echo "syncing logs for $USER from $A to $LOG_DEST ..."
-
- chown -R $USER:www-data $A
- chmod -R ug+rw $A
-
- k5start -tU -f /etc/keytabs/cgi/$USER \
- -- su $USER -c "rsync -a $A/ $LOG_DEST/"
-done
+#!/bin/bash
+
+# invoke this as root on mire
+
+exec 2>&1
+
+# drop any tokens; use only users' cgi tokens
+kdestroy > /dev/null 2>&1
+unlog
+
+#VERBOSE=true
+VERBOSE=false
+
+LOCAL_LOG_DIR=/var/log/apache2/user
+KEYTAB_DIR=/etc/keytabs/user.daemon
+AFS_USER_DIR=/afs/hcoop.net/user
+ERROR=no
+
+# Sanify permissions so that we can safely create tmp directories and
+# run rsync.
+chmod -R u=rwX,g=rX,o=X $LOCAL_LOG_DIR
+
+# Iterate through logs for each user
+for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do
+ USER=`basename $A`
+ PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
+ USER_HOME=$AFS_USER_DIR/$PATHBITS
+ LOG_SRC=$A/apache/log
+ LOG_DEST=$USER_HOME/.logs/apache/
+ TMP_DEST=$LOG_SRC.tmp
+
+ # Skip deleted or empty log directories
+ if test ! -d "$LOG_SRC" || ! ls "$LOG_SRC"/*/*/*.log >/dev/null 2>&1; then
+ continue
+ fi
+
+ # Skip people who have unreadable log subdirectories
+ if test -d "$USER_HOME/.logs" && \
+ ! ls "$USER_HOME/.logs" >/dev/null 2>&1; then
+ continue
+ fi
+
+ # Skip people who do not have keytabs
+ if test ! -f "$KEYTAB_DIR/$USER"; then
+ continue
+ fi
+
+ if test "$VERBOSE" = "true"; then
+ echo
+ echo "=============================================================================="
+ echo "syncing logs for $USER from $A"
+ echo " to $LOG_DEST ..."
+ fi
+
+ if test ! -d "$LOG_DEST"; then
+ echo "Error: $LOG_DEST does not exist, please make it"
+ ERROR=yes
+ else
+ rm -fr $TMP_DEST
+ cp -r $LOG_SRC $TMP_DEST
+ chown -R $USER:nogroup $TMP_DEST
+ chmod -R u=rwX,go=X $TMP_DEST
+ k5start -qtU -f $KEYTAB_DIR/$USER \
+ -- su $USER -c "rsync -a $TMP_DEST/ $LOG_DEST/"
+ rm -fr $TMP_DEST
+ test "$VERBOSE" = "true" && echo " done."
+ fi
+done
+
+if test "$ERROR" = "yes"; then
+ exit 1
+else
+ exit 0
+fi
+