HCoop
/
clinton
/
scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apache-sync-logs: Put logs in ~USER/.logs
[clinton/scripts.git]
/
apache-sync-logs
diff --git
a/apache-sync-logs
b/apache-sync-logs
index
b7f49ea
..
7937d2f
100755
(executable)
--- a/
apache-sync-logs
+++ b/
apache-sync-logs
@@
-14,11
+14,14
@@
VERBOSE=false
LOCAL_LOG_DIR=/var/log/apache2
KEYTAB_DIR=/etc/keytabs/user.daemon
AFS_USER_DIR=/afs/hcoop.net/user
LOCAL_LOG_DIR=/var/log/apache2
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
USER=`basename $A`
PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$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_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
if [ "$VERBOSE" = "true" ]; then
echo
@@
-27,16
+30,24
@@
for A in $(find $LOCAL_LOG_DIR/user -mindepth 3 -maxdepth 3 -print); do
echo " to $LOG_DEST ..."
fi
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"
if [ ! -d "$LOG_DEST" ]; then
echo "Error: $LOG_DEST does not exist, please make it"
- exit 1
+ ERROR=yes
else
else
+ rm -fr $TMP_DEST
+ cp -a $LOG_SRC $TMP_DEST
+ chown -R $USER $TMP_DEST
+ chmod -R u=rwX,go=X $TMP_DEST
k5start -qtU -f $KEYTAB_DIR/$USER \
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."
[ "$VERBOSE" = "true" ] && echo " done."
- exit 0
fi
done
fi
done
+
+if [ "$ERROR" = "yes" ]; then
+ exit 1
+else
+ exit 0
+fi
+