X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/f9be7472fbfce629e0a7796a477715f90a4084e9..d890ae7b249b59b66da1481e9bc35f0c1fc53804:/apache-sync-logs?ds=sidebyside

diff --git a/apache-sync-logs b/apache-sync-logs
index b7f49ea..229cf20 100755
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -11,14 +11,22 @@ 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
 
     if [ "$VERBOSE" = "true" ]; then
         echo
@@ -27,16 +35,24 @@ 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
+        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/"
+            -- 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
+