Update apache-sync-logs script

diff --git a/apache-sync-logs b/apache-sync-logs
dissimilarity index 81%
index 9a1f65d..602efbc 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -1,27 +1,40 @@
-#!/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_DEST=$AFS_USER_DIR/$PATHBITS/logs/apache/
+
+    if [ "$VERBOSE" = "true" ]; then
+        echo
+        echo "=============================================================================="
+        echo "syncing logs for $USER from $A"
+        echo "  to $LOG_DEST ..."
+    fi
+
+    chown -R $USER:www-data $A
+    chmod -R ug+rw $A
+
+    if [ ! -d "$LOG_DEST" ]; then
+        echo "Error: $LOG_DEST does not exist, please make it"
+    else
+        k5start -qtU -f $KEYTAB_DIR/$USER \
+            -- su $USER -c "rsync -rlptOgoD $A/apache/log/ $LOG_DEST/"
+        [ "$VERBOSE" = "true" ] && echo "  done."
+    fi
+done