hcoop-git-maint: Improve detection of bad permissions.

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

diff --git a/apache-sync-logs b/apache-sync-logs
index b3d1ab2..f5ee0ad 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -31,17 +31,26 @@ for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do
 
     # Skip deleted or empty log directories
     if test ! -d "$LOG_SRC" || ! ls "$LOG_SRC"/*/*/*.log >/dev/null 2>&1; then
+        if test "$VERBOSE" = "true"; then
+               echo "Skipping $USER (deleted or empty log dir $LOG_SRC)"
+        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
+        if test "$VERBOSE" = "true"; then
+               echo "Skipping $USER (unreadable log dir $USER_HOME/.logs)"
+        fi
         continue
     fi
 
     # Skip people who do not have keytabs
     if test ! -f "$KEYTAB_DIR/$USER"; then
+        if test "$VERBOSE" = "true"; then
+               echo "Skipping $USER (missing keytab $KEYTAB_DIR/$USER)"
+        fi
         continue
     fi
 
@@ -53,15 +62,18 @@ for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do
     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 \
-            -- su $USER -c "rsync -a $TMP_DEST/ $LOG_DEST/"
+            -- sudo -u $USER rsync -a $TMP_DEST/ $LOG_DEST/
         rm -fr $TMP_DEST
         test "$VERBOSE" = "true" && echo "  done."
     fi