apache-sync-logs: Really fix permissions issues this time

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

diff --git a/apache-sync-logs b/apache-sync-logs
index 7937d2f..229cf20 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -11,12 +11,17 @@ 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_SRC=$A/apache/log
@@ -35,8 +40,8 @@ for A in $(find $LOCAL_LOG_DIR/user -mindepth 3 -maxdepth 3 -print); do
         ERROR=yes
     else
         rm -fr $TMP_DEST
-        cp -a $LOG_SRC $TMP_DEST
-        chown -R $USER $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 $TMP_DEST/ $LOG_DEST/"