-#!/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
+KEYTAB_DIR=/etc/keytabs/user.daemon
+AFS_USER_DIR=/afs/hcoop.net/user
+
+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/
+ TMP_DEST=$LOG_SRC.tmp
+
+ if [ "$VERBOSE" = "true" ]; then
+ echo
+ echo "=============================================================================="
+ echo "syncing logs for $USER from $A"
+ echo " to $LOG_DEST ..."
+ fi
+
+ if [ ! -d "$LOG_DEST" ]; then
+ echo "Error: $LOG_DEST does not exist, please make it"
+ exit 1
+ else
+ rm -fr $TMP_DEST
+ cp -a $LOG_SRC $TMP_DEST
+ chown -R $USER $TMP_DEST
+ chmod -R u+rw $TMP_DEST
+ k5start -qtU -f $KEYTAB_DIR/$USER \
+ -- su $USER -c "rsync -a $TMP_DEST/ $LOG_DEST/"
+ rm -fr $TMP_DEST
+ [ "$VERBOSE" = "true" ] && echo " done."
+ exit 0
+ fi
+done