svn commit: r421803 - in /maven/components/trunk/maven-meeper/src/bin: m2-sync/codehaus-m2-sync.sh m2-sync/m2-sync.sh syncopate/conf/codehaus.conf syncopate/sync syncopate/syncopate.conf

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r421803 - in /maven/components/trunk/maven-meeper/src/bin: m2-sync/codehaus-m2-sync.sh m2-sync/m2-sync.sh syncopate/conf/codehaus.conf syncopate/sync syncopate/syncopate.conf

brettporter
Administrator
Author: brett
Date: Thu Jul 13 21:31:13 2006
New Revision: 421803

URL: http://svn.apache.org/viewvc?rev=421803&view=rev
Log:
get the codehaus sync running again

Modified:
    maven/components/trunk/maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh
    maven/components/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh
    maven/components/trunk/maven-meeper/src/bin/syncopate/conf/codehaus.conf
    maven/components/trunk/maven-meeper/src/bin/syncopate/sync
    maven/components/trunk/maven-meeper/src/bin/syncopate/syncopate.conf

Modified: maven/components/trunk/maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh?rev=421803&r1=421802&r2=421803&view=diff
==============================================================================
--- maven/components/trunk/maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh (original)
+++ maven/components/trunk/maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh Thu Jul 13 21:31:13 2006
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-FROM=[hidden email]:/var/www/domains/codehaus.org/repository/htdocs/org/codehaus/
-TO=org/codehaus/
+FROM=[hidden email]:/repository/
+TO=.
 SSH_OPTS="-i $HOME/.ssh/new-id_dsa"
-RSYNC_OPTS="-k"
+#RSYNC_OPTS="-L"
 
-# NOTE: If the rsync options change, the codehaus configuration may need to be changed.
-# It currently runs "rsync --server --sender -vnlkogDtprcz . /var/www/domains/codehaus.org/repository/htdocs/org/codehaus/" regardless of the rsync command sent
+## NOTE that codehaus only honours some rsync options. Others may be summarily discarded and/or cause the rsync to break - check
+## with them if changing them
 
 source ./m2-sync.sh

Modified: maven/components/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh?rev=421803&r1=421802&r2=421803&view=diff
==============================================================================
--- maven/components/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh (original)
+++ maven/components/trunk/maven-meeper/src/bin/m2-sync/m2-sync.sh Thu Jul 13 21:31:13 2006
@@ -25,4 +25,4 @@
 # ideally we would use --ignore-existing but we need to copy the metadata files
 
 echo "Syncing $FROM -> $TO"
-rsync --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt $RSYNC_OPTS -acivz -e "ssh $SSH_OPTS" $FROM $TO
+rsync --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt $RSYNC_OPTS -Lrtivz -e "ssh $SSH_OPTS" $FROM $TO

Modified: maven/components/trunk/maven-meeper/src/bin/syncopate/conf/codehaus.conf
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-meeper/src/bin/syncopate/conf/codehaus.conf?rev=421803&r1=421802&r2=421803&view=diff
==============================================================================
--- maven/components/trunk/maven-meeper/src/bin/syncopate/conf/codehaus.conf (original)
+++ maven/components/trunk/maven-meeper/src/bin/syncopate/conf/codehaus.conf Thu Jul 13 21:31:13 2006
@@ -2,9 +2,9 @@
 id = codehaus
 name = Codehaus
 contact = [hidden email]
-batchDisabled = true
 
 [host]
-address=beaver.codehaus.org
+address=repository.codehaus.org
 directory=/dist
-rsyncUser=maven
+rsyncUser=mavensync
+identity=/home/maven/.ssh/new-id_dsa

Modified: maven/components/trunk/maven-meeper/src/bin/syncopate/sync
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-meeper/src/bin/syncopate/sync?rev=421803&r1=421802&r2=421803&view=diff
==============================================================================
--- maven/components/trunk/maven-meeper/src/bin/syncopate/sync (original)
+++ maven/components/trunk/maven-meeper/src/bin/syncopate/sync Thu Jul 13 21:31:13 2006
@@ -70,18 +70,25 @@
 
     my $rsyncUser = $configuration->val( "syncopate", "rsyncUser" );
     
+    my $identity = $configuration->val( "syncopate", "identity" );
+    
     if ( $sourceConfiguration->val( "host", "rsyncUser" ) )
     {
         $rsyncUser = $sourceConfiguration->val( "host", "rsyncUser" );
     }
 
+    if ( $sourceConfiguration->val( "host", "identity" ) )
+    {
+        $identity = "-i " . $sourceConfiguration->val( "host", "identity" );
+    }
+
     if ( $sourceConfiguration->val( "host", "repoDirectory" ) )
     {
         $repoDirectory = $sourceConfiguration->val( "host", "repoDirectory" );
     }
     
-    my $cmd = "rsync $standardOptions $options --rsh=\"ssh -oBatchMode=yes -T -l $rsyncUser\" $address:$directory/ $repoDirectory";
-    
+    my $cmd = "rsync $standardOptions $options --rsh=\"ssh -oBatchMode=yes $identity -T -l $rsyncUser\" $address:$directory/ $repoDirectory";
+
     runRsync( $cmd, $sourceConfiguration );
 
     $repoDirectory = $globalRepoDirectory;

Modified: maven/components/trunk/maven-meeper/src/bin/syncopate/syncopate.conf
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-meeper/src/bin/syncopate/syncopate.conf?rev=421803&r1=421802&r2=421803&view=diff
==============================================================================
--- maven/components/trunk/maven-meeper/src/bin/syncopate/syncopate.conf (original)
+++ maven/components/trunk/maven-meeper/src/bin/syncopate/syncopate.conf Thu Jul 13 21:31:13 2006
@@ -1,6 +1,6 @@
 [syncopate]
 repoDirectory=/home/maven/repository-staging/to-ibiblio/maven
-options=--log-format="artifact %f %l %t" -rvl -L --size-only --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt
+options=--log-format="artifact %f %l %t" -rvt -L --size-only --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt
 rsyncUser=rsync
 
 reportUrl=http://test.maven.codehaus.org/reports/syncopate