diff --git a/maven-meeper/src/bin/crontab.txt b/maven-meeper/src/bin/crontab.txt index da1ecb870..977fb0aa3 100644 --- a/maven-meeper/src/bin/crontab.txt +++ b/maven-meeper/src/bin/crontab.txt @@ -2,3 +2,4 @@ MAILTO=repository@maven.org 0 */4 * * * cd $HOME/bin; ./synchronize.sh 0 0 * * * cd $HOME/reports; ./run.sh +30 */4 * * * cd $HOME/bin; ./kill_long_runners.sh rsync 3 diff --git a/maven-meeper/src/bin/synchronize.sh b/maven-meeper/src/bin/synchronize.sh index 525d15bb9..fa2408c73 100755 --- a/maven-meeper/src/bin/synchronize.sh +++ b/maven-meeper/src/bin/synchronize.sh @@ -5,7 +5,7 @@ # 2. Convert Maven 1.x repository to Maven 2.x repository # 3. Manual fixes # 4. Sync Maven 2.x repositories to central -# 5. Sync the Maven 2.x repository to Ibiblio +# 5. Sync the Maven 2.x repository to Cica and Ibiblio # 6. Copy the mod_rewrite rules to the Maven 1.x repository @ Ibiblio # ------------------------------------------------------------------------ @@ -95,16 +95,6 @@ sha1sum $CL/maven-metadata.xml > $CL/maven-metadata.xml.sha1 ./m2-sync.sh go ) -# ------------------------------------------------------------------------ -# Ibiblio synchronization: sync the central repository to Ibiblio -# ------------------------------------------------------------------------ - -[ "$MODE" = "batch" ] && echo && echo "Press any key to run the sync to Ibiblio, or hit ^C to quit." && echo - -./synchronize-central-to-ibiblio.sh $syncProperties -retval=$?; if [ $retval != 0 ]; then exit $retval; fi -retval=$?; if [ $retval != 0 ]; then exit $retval; fi - # ------------------------------------------------------------------------ # Cica.es synchronization: sync the central repository to Cica.es # ------------------------------------------------------------------------ @@ -115,6 +105,16 @@ retval=$?; if [ $retval != 0 ]; then exit $retval; fi retval=$?; if [ $retval != 0 ]; then exit $retval; fi retval=$?; if [ $retval != 0 ]; then exit $retval; fi +# ------------------------------------------------------------------------ +# Ibiblio synchronization: sync the central repository to Ibiblio +# ------------------------------------------------------------------------ + +[ "$MODE" = "batch" ] && echo && echo "Press any key to run the sync to Ibiblio, or hit ^C to quit." && echo + +./synchronize-central-to-ibiblio.sh $syncProperties +retval=$?; if [ $retval != 0 ]; then exit $retval; fi +retval=$?; if [ $retval != 0 ]; then exit $retval; fi + # ------------------------------------------------------------------------ # Copy the mod_rewrite rules to the Maven 1.x repository # ------------------------------------------------------------------------