apache-sync-logs: fix bug where only one user gets logs updated

[clinton/scripts.git] / apache-sync-logs

diff --git a/apache-sync-logs b/apache-sync-logs
index 64dae8a..2e88efd 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -14,11 +14,14 @@ 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
@@ -29,13 +32,22 @@ for A in $(find $LOCAL_LOG_DIR/user -mindepth 3 -maxdepth 3 -print); do
 
     if [ ! -d "$LOG_DEST" ]; then
         echo "Error: $LOG_DEST does not exist, please make it"
-        exit 1
+        ERROR=yes
     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 $A/apache/log/ $LOG_DEST/ ;
-            chown -R $USER $LOG_DEST ;
-            chmod -R u+rw $LOG_DEST"
+            -- su $USER -c "rsync -a $TMP_DEST/ $LOG_DEST/"
+        rm -fr $TMP_DEST
         [ "$VERBOSE" = "true" ] && echo "  done."
-        exit 0
     fi
 done
+
+if [ "$ERROR" = "yes" ]; then
+    exit 1
+else
+    exit 0
+fi
+