Magic

[public/mirror.git] / csc-sync-debian

diff --git a/csc-sync-debian b/csc-sync-debian
index a1313ee..d6eb2d7 100755 (executable)
--- a/csc-sync-debian
+++ b/csc-sync-debian
@@ -7,6 +7,7 @@ fi
 
 set -e
 
+RSYNC="rsync"
 TOP_DIR=/mirror
 TO=$TOP_DIR/root/$1
 RSYNC_HOST=$2
@@ -113,10 +114,8 @@ LOCK_TIMEOUT=360
 # uncomment the following lines (and edit the other file).
 
 # . ftpsync.conf
-export RSYNC_PASSWORD
-if [[ "$RSYNC_USER" != "" ]]; then
-    RSYNC_HOST=$RSYNC_USER@$RSYNC_HOST
-fi
+# export RSYNC_PASSWORD
+# RSYNC_HOST=$RSYNC_USER@$RSYNC_HOST
 
 #-----------------------------------------------------------------------------#
 
@@ -185,7 +184,7 @@ if [ -f "$LOCK" ]; then
   if [ "`find $LOCK -maxdepth 1 -amin -$LOCK_TIMEOUT`" = "" ]; then
 # Note: this requires the procps ps; for other ps', adjust as necessary
     if ps ax | grep '[r]'sync | grep -q $RSYNC_HOST; then
-      echo "stale lock found, but a rsync is still running, aiee!"
+      echo "stale lock found, but a rsync is still running, aiee!" > /dev/stderr
       exit 1
     else
       echo "stale lock found (not accessed in the last $LOCK_TIMEOUT minutes), forcing update!"
@@ -208,7 +207,7 @@ set +e
 if [[ "$TRACE_HOST" != "" ]]; then
     TRACE_OLD_TIME=`stat -c%Y $TO/$TRACE_DIR/$TRACE_HOST 2> /dev/null`
     TRACE_NEW_FILE=/tmp/$RSYNC_HOST_$RSYNC_DIR_$RANDOM
-    rsync --times --verbose --address=$ADDRESS \
+    $RSYNC -tv --address=$ADDRESS \
         $RSYNC_HOST::$RSYNC_DIR/$TRACE_DIR/$TRACE_HOST \
         $TRACE_NEW_FILE >> $LOGFILE 2>&1
     TRACE_NEW_TIME=`stat -c%Y $TRACE_NEW_FILE`
@@ -221,18 +220,18 @@ if [[ "$TRACE_HOST" != "" ]]; then
 fi
 
 # First sync /pool
-rsync --recursive --links --hard-links --times --verbose \
+$RSYNC -rlHtv \
      $TMP_EXCLUDE $EXCLUDE $SOURCE_EXCLUDE \
-     --address=$ADDRESS \
+     --timeout=3600 --address=$ADDRESS \
      $RSYNC_HOST::$RSYNC_DIR/pool/ $TO/pool/ >> $LOGFILE 2>&1
 result=$?
 
 if [ 0 = $result ]; then
        # Now sync the remaining stuff
-       rsync --recursive --links --hard-links --times --verbose --delay-updates --delete-after \
+       $RSYNC -rlHtv --delay-updates --delete-after \
             --exclude "Archive-Update-in-Progress-${HOSTNAME}" \
             --exclude "${TRACE_DIR}/${HOSTNAME}" \
-            --address=$ADDRESS \
+            --timeout=3600 --address=$ADDRESS \
             $TMP_EXCLUDE $EXCLUDE $SOURCE_EXCLUDE \
             $RSYNC_HOST::$RSYNC_DIR $TO >> $LOGFILE 2>&1