apache-sync-logs: copy to a temp dir, set perms, and then copy over to AFS

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

diff --git a/apache-sync-logs b/apache-sync-logs
index b0e007b..32bef4c 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -18,7 +18,9 @@ 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
@@ -27,14 +29,18 @@ for A in $(find $LOCAL_LOG_DIR/user -mindepth 3 -maxdepth 3 -print); do
         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"
+        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 $A/apache/log/ $LOG_DEST/"
+            -- su $USER -c "rsync -a $TMP_DEST/ $LOG_DEST/"
+        rm -fr $TMP_DEST
         [ "$VERBOSE" = "true" ] && echo "  done."
+        exit 0
     fi
 done