X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/0c49919ac255dce7e886974424a77288dae09f9f..2a2fcc8e538e9d71c4c02238d885b6d4503fbdea:/apache-sync-logs

diff --git a/apache-sync-logs b/apache-sync-logs
index b0e007b..6e83894 100755
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -11,30 +11,53 @@ unlog
 #VERBOSE=true
 VERBOSE=false
 
-LOCAL_LOG_DIR=/var/log/apache2
+LOCAL_LOG_DIR=/var/log/apache2/user
 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
+# 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
-    LOG_DEST=$AFS_USER_DIR/$PATHBITS/logs/apache/
+    LOG_SRC=$A/apache/log
+    LOG_DEST=$AFS_USER_DIR/$PATHBITS/.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
 
-    if [ "$VERBOSE" = "true" ]; then
+    if test "$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
+    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 $A/apache/log/ $LOG_DEST/"
-        [ "$VERBOSE" = "true" ] && echo "  done."
+            -- 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
+