mirror of https://github.com/apache/maven.git
get the codehaus sync running again
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421803 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0712f84f81
commit
8927d09f1c
|
@ -1,11 +1,11 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
FROM=mavensync@repository.codehaus.org:/var/www/domains/codehaus.org/repository/htdocs/org/codehaus/
|
FROM=mavensync@repository.codehaus.org:/repository/
|
||||||
TO=org/codehaus/
|
TO=.
|
||||||
SSH_OPTS="-i $HOME/.ssh/new-id_dsa"
|
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.
|
## NOTE that codehaus only honours some rsync options. Others may be summarily discarded and/or cause the rsync to break - check
|
||||||
# It currently runs "rsync --server --sender -vnlkogDtprcz . /var/www/domains/codehaus.org/repository/htdocs/org/codehaus/" regardless of the rsync command sent
|
## with them if changing them
|
||||||
|
|
||||||
source ./m2-sync.sh
|
source ./m2-sync.sh
|
||||||
|
|
|
@ -25,4 +25,4 @@ cd $HOME/repository-staging/to-ibiblio/maven2
|
||||||
# ideally we would use --ignore-existing but we need to copy the metadata files
|
# ideally we would use --ignore-existing but we need to copy the metadata files
|
||||||
|
|
||||||
echo "Syncing $FROM -> $TO"
|
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
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
id = codehaus
|
id = codehaus
|
||||||
name = Codehaus
|
name = Codehaus
|
||||||
contact = carlos@apache.org
|
contact = carlos@apache.org
|
||||||
batchDisabled = true
|
|
||||||
|
|
||||||
[host]
|
[host]
|
||||||
address=beaver.codehaus.org
|
address=repository.codehaus.org
|
||||||
directory=/dist
|
directory=/dist
|
||||||
rsyncUser=maven
|
rsyncUser=mavensync
|
||||||
|
identity=/home/maven/.ssh/new-id_dsa
|
||||||
|
|
|
@ -70,18 +70,25 @@ sub syncSource()
|
||||||
|
|
||||||
my $rsyncUser = $configuration->val( "syncopate", "rsyncUser" );
|
my $rsyncUser = $configuration->val( "syncopate", "rsyncUser" );
|
||||||
|
|
||||||
|
my $identity = $configuration->val( "syncopate", "identity" );
|
||||||
|
|
||||||
if ( $sourceConfiguration->val( "host", "rsyncUser" ) )
|
if ( $sourceConfiguration->val( "host", "rsyncUser" ) )
|
||||||
{
|
{
|
||||||
$rsyncUser = $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" ) )
|
if ( $sourceConfiguration->val( "host", "repoDirectory" ) )
|
||||||
{
|
{
|
||||||
$repoDirectory = $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 );
|
runRsync( $cmd, $sourceConfiguration );
|
||||||
|
|
||||||
$repoDirectory = $globalRepoDirectory;
|
$repoDirectory = $globalRepoDirectory;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[syncopate]
|
[syncopate]
|
||||||
repoDirectory=/home/maven/repository-staging/to-ibiblio/maven
|
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
|
rsyncUser=rsync
|
||||||
|
|
||||||
reportUrl=http://test.maven.codehaus.org/reports/syncopate
|
reportUrl=http://test.maven.codehaus.org/reports/syncopate
|
||||||
|
|
Loading…
Reference in New Issue