Merge branch 'master' of ssh://mire.hcoop.net/home/mwolson_admin/hcoop-git/misc

diff --git a/apache-sync-logs b/apache-sync-logs
index b3d1ab2..3f83088 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -53,15 +53,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