run-in-pagsh: Add /usr/bin/ prefix for consistency

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

diff --git a/apache-sync-logs b/apache-sync-logs
index 2e88efd..f56b08a 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -20,7 +20,7 @@ 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/
+    LOG_DEST=$AFS_USER_DIR/$PATHBITS/.logs/apache/
     TMP_DEST=$LOG_SRC.tmp
 
     if [ "$VERBOSE" = "true" ]; then
@@ -35,11 +35,18 @@ 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
-        chmod -R u+rw $TMP_DEST
+        cp -r $LOG_SRC $TMP_DEST
+        chmod -R u=rwX,go=X $TMP_DEST
+        # There is an issue here.  With nocelic and magnus, doing su
+        # $USER will cause rsync to not be able to read $LOG_DEST,
+        # even if it is first chown'ed to $USER.  So we have to just
+        # be root, and not change ownership or group when copying the
+        # files.  This makes group be root on AFS, but that shouldn't
+        # matter for anything important.  Perhaps some PAM issue is
+        # related to this, since even read/write to local filesystem
+        # is screwed up.
         k5start -qtU -f $KEYTAB_DIR/$USER \
-            -- su $USER -c "rsync -a $TMP_DEST/ $LOG_DEST/"
+            -- rsync -a --no-o --no-g $TMP_DEST/ $LOG_DEST/
         rm -fr $TMP_DEST
         [ "$VERBOSE" = "true" ] && echo "  done."
     fi