HCoop
/
clinton
/
scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hcoop-git-maint: Fix URL.
[clinton/scripts.git]
/
apache-sync-logs
diff --git
a/apache-sync-logs
b/apache-sync-logs
index
fdc2919
..
3f83088
100755
(executable)
--- a/
apache-sync-logs
+++ b/
apache-sync-logs
@@
-24,8
+24,9
@@
chmod -R u=rwX,g=rX,o=X $LOCAL_LOG_DIR
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
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
+ USER_HOME=$AFS_USER_DIR/$PATHBITS
LOG_SRC=$A/apache/log
LOG_SRC=$A/apache/log
- LOG_DEST=$
AFS_USER_DIR/$PATHBITS
/.logs/apache/
+ LOG_DEST=$
USER_HOME
/.logs/apache/
TMP_DEST=$LOG_SRC.tmp
# Skip deleted or empty log directories
TMP_DEST=$LOG_SRC.tmp
# Skip deleted or empty log directories
@@
-33,6
+34,12
@@
for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do
continue
fi
continue
fi
+ # Skip people who have unreadable log subdirectories
+ if test -d "$USER_HOME/.logs" && \
+ ! ls "$USER_HOME/.logs" >/dev/null 2>&1; then
+ continue
+ fi
+
# Skip people who do not have keytabs
if test ! -f "$KEYTAB_DIR/$USER"; then
continue
# Skip people who do not have keytabs
if test ! -f "$KEYTAB_DIR/$USER"; then
continue
@@
-46,15
+53,18
@@
for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do
fi
if test ! -d "$LOG_DEST"; then
fi
if test ! -d "$LOG_DEST"; then
- echo "Error: $LOG_DEST does not exist, please make it"
- ERROR=yes
+# echo "Error: $LOG_DEST does not exist, please make it"
+# ERROR=yes
+# We will assume that people know what they are doing when they
+# delete their ~/.logs/apache directory ....
+ continue
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 \
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 $TMP_DEST/ $LOG_DEST/"
+ -- su
do -u $USER rsync -a $TMP_DEST/ $LOG_DEST/
rm -fr $TMP_DEST
test "$VERBOSE" = "true" && echo " done."
fi
rm -fr $TMP_DEST
test "$VERBOSE" = "true" && echo " done."
fi