From 9aaa0aadba78e8ca6fb3fa47839a066b938ac327 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Mon, 28 Dec 2009 16:54:53 +0100 Subject: Sample config make clear we need the username in the mirrors file, fix the broken example. Also mention backwards compatibility Signed-off-by: Joerg Jaspert --- etc/runmirrors.mirror.sample | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'etc/runmirrors.mirror.sample') diff --git a/etc/runmirrors.mirror.sample b/etc/runmirrors.mirror.sample index 2f841bb..e2820e3 100644 --- a/etc/runmirrors.mirror.sample +++ b/etc/runmirrors.mirror.sample @@ -7,6 +7,7 @@ # # Type ShortName HostName User -$SOMESSHOPTION # +# The fields Type, ShortName, HostName and User are *mandantory*. # # Type is either all or staged, meaning: # all - do a "normal" push. Trigger them, go on. @@ -33,6 +34,11 @@ # want. There is currently no way around this, as that would mean # dropping backward compatibility. # +# Backwards compatibility: +# An older runmirrors script will NOT run with a newer runmirrors.mirror file, but +# a new runmirrors can run with an old runmirrors.mirror file. This should make updates +# painless. +# # Examples: # all eu.puccini puccini.debian.org archvsync 2 # @@ -43,11 +49,11 @@ # # which will do the same as above, but use port 2222 to connect to. # -# staged eu.puccini puccini.debian.org -# staged eu.powell powell.debian.org +# staged eu.puccini puccini.debian.org archvsync +# staged eu.powell powell.debian.org archvsync # # will push both puccini and powell in stage1, waiting for both to -# finish stage1 before stage2 gets pushed. +# finish stage1 before stage2 gets pushed. The username will be archvsync. # # One special value is allowed: DELAY # This word has to be on a line itself, followed by a space and a number. -- cgit v1.2.3 From 693d141ebe88d1428eda958ffe6ead7fa164d258 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Tue, 29 Dec 2009 13:18:36 +0100 Subject: More comments in the mirror sample Signed-off-by: Joerg Jaspert --- etc/runmirrors.mirror.sample | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'etc/runmirrors.mirror.sample') diff --git a/etc/runmirrors.mirror.sample b/etc/runmirrors.mirror.sample index e2820e3..744ad98 100644 --- a/etc/runmirrors.mirror.sample +++ b/etc/runmirrors.mirror.sample @@ -9,10 +9,13 @@ # # The fields Type, ShortName, HostName and User are *mandantory*. # -# Type is either all or staged, meaning: +# Type is either all, staged or mhop, meaning: # all - do a "normal" push. Trigger them, go on. # staged - do a two-stage push, waiting for them after stage 2(and all others that # are staged) before doing stage2 +# mhop - send a multi-hop staged push. This will tell the mirror to initiate +# a mhop/stage1 push to its staged/mhop mirrors and then exit. +# When all mhop got back we then send the stage2 through to them. # # ShortName will be used as a shorthand in logfile outputs and for the logfile # where every ssh output gets redirected to. @@ -42,18 +45,25 @@ # Examples: # all eu.puccini puccini.debian.org archvsync 2 # -# will push puccini.debian.org, user archvsync, using ssh protocol 2 and the specified ssh key. -# +# -> will push puccini.debian.org, user archvsync, using ssh protocol 2 +# and the globally configured ssh key. # # all eu.puccini puccini.debian.org archvsync -p 2222 # -# which will do the same as above, but use port 2222 to connect to. +# -> will do the same as above, but use port 2222 to connect to. # # staged eu.puccini puccini.debian.org archvsync # staged eu.powell powell.debian.org archvsync # -# will push both puccini and powell in stage1, waiting for both to -# finish stage1 before stage2 gets pushed. The username will be archvsync. +# -> will push both puccini and powell in stage1, waiting for both to +# finish stage1 before stage2 gets pushed. The username will be archvsync. +# +# staged eu.puccini puccini.debian.org archvsync +# mhop eu.powell powell.debian.org archvsync +# +# -> will do the same as above, but powell gets told about mhop and can then +# push its own staged/mhop mirrors before returning. When both returned +# then stage2 is sent to both. # # One special value is allowed: DELAY # This word has to be on a line itself, followed by a space and a number. -- cgit v1.2.3