X-Git-Url: https://git.hcoop.net/hcoop/scripts.git/blobdiff_plain/74c1bc9e5b5376d95c9949d1105209557052e83f..089cf0fa601e712039743fb70d5e819c4ce2a63e:/apache-sync-logs

diff --git a/apache-sync-logs b/apache-sync-logs
dissimilarity index 60%
index 7937d2f..58c24c5 100755
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -1,53 +1,83 @@
-#!/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
-ERROR=no
-
-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"
-        ERROR=yes
-    else
-        rm -fr $TMP_DEST
-        cp -a $LOG_SRC $TMP_DEST
-        chown -R $USER $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
-        [ "$VERBOSE" = "true" ] && echo "  done."
-    fi
-done
-
-if [ "$ERROR" = "yes" ]; then
-    exit 1
-else
-    exit 0
-fi
-
+#!/bin/bash
+
+# invoked by cron as root on each web node
+
+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
+
+# 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/$(hostname)
+    LOG_DEST=$USER_HOME/.logs/apache/$(hostname)
+
+    # Skip deleted or empty log directories
+    # Possible inefficiency? (ls entire directory*400+ dirs)
+    if test ! -d "$LOG_SRC" || ! ls "$LOG_SRC"/*/*.log >/dev/null 2>&1; then
+        if test "$VERBOSE" = "true"; then
+		echo "Skipping $USER (deleted or empty log dir $LOG_SRC)"
+        fi
+        continue
+    fi
+
+    # Skip people who have unreadable log subdirectories
+    # This test is broken! --clinton
+    if test -d "$USER_HOME/.logs" && \
+        ! ls "$USER_HOME/.logs" >/dev/null 2>&1; then
+        if test "$VERBOSE" = "true"; then
+		echo "Skipping $USER (unreadable log dir $USER_HOME/.logs)"
+        fi
+        continue
+    fi
+
+    # Skip people who do not have keytabs
+    if test ! -f "$KEYTAB_DIR/$USER"; then
+        if test "$VERBOSE" = "true"; then
+		echo "Skipping $USER (missing keytab $KEYTAB_DIR/$USER)"
+        fi
+        continue
+    fi
+
+    if test "$VERBOSE" = "true"; then
+        echo
+        echo "=============================================================================="
+        echo "syncing logs for $USER from $LOG_SRC"
+        echo "  to $LOG_DEST ..."
+    fi
+
+    if test ! -d "$USER_HOME/.logs/apache"; then
+        echo "Error: $USER_HOME/.logs/apache does not exist, please make it"
+#        ERROR=yes
+# We will assume that people know what they are doing when they
+# delete their ~/.logs/apache directory ....
+# This is perhaps a bad assumption --clinton
+        if test "$VERBOSE" = "true"; then
+		echo "Skipping $USER (no $LOG_DEST directory)"
+        fi
+        continue
+    else
+	# LOG_SRC/* is important: don't remove log files just because a vhost is gone
+	k5start -qtU -f $KEYTAB_DIR/$USER -- rsync -a --no-owner --no-group --delete $LOG_SRC/* $LOG_DEST/
+	test "$VERBOSE" = "true" && echo "  done."
+    fi
+done
+
+if test "$ERROR" = "yes"; then
+    exit 1
+else
+    exit 0
+fi
+