diff options
| author | Joerg Jaspert <joerg@debian.org> | 2009-10-08 00:17:35 +0200 |
|---|---|---|
| committer | Joerg Jaspert <joerg@debian.org> | 2009-10-08 00:17:35 +0200 |
| commit | 2d2649136d87bb8c196c37e0bb17b81a75cdcaef (patch) | |
| tree | 18c62cbfd71f49f5ba405b1ed9c22cf3be672063 /etc | |
| parent | 4d17293723e7892d6eb74439da7e223285a11442 (diff) | |
release version 80286
document the new alternative runmirrors.mirror line format
Signed-off-by: Joerg Jaspert <joerg@debian.org>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/runmirrors.mirror.sample | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/etc/runmirrors.mirror.sample b/etc/runmirrors.mirror.sample index 3d31ec7..2f841bb 100644 --- a/etc/runmirrors.mirror.sample +++ b/etc/runmirrors.mirror.sample @@ -3,6 +3,11 @@ # # Type ShortName HostName User SSHProtocol SSHKeyFile # +# ALTERNATIVELY the line may look like +# +# Type ShortName HostName User -$SOMESSHOPTION +# +# # Type is either all or staged, 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 @@ -15,11 +20,29 @@ # If SSHProtocol is empty, it will default to 2, but if you want to # define a keyfile you HAVE TO set protocol too! # +# With the ALTERNATIVE syntax you are able to use any special ssh option +# you want just for one special mirror. The option after the username +# then MUST start with a -, in which case the whole rest of the line is taken +# as a set of options to give to ssh, it is passed through without doing +# anything with it. +# +# There is one caveat here: Should you want to use the -i option to give +# another ssh key to use, keep in mind that the master keyfile will +# always be presented too! That is, ssh will show both keys to the other +# side and the first one presented wins. Which might not be the key you +# want. There is currently no way around this, as that would mean +# dropping backward compatibility. +# # Examples: -# all eu.puccini puccini.debian.org archvsync 2 ~/.ssh/push_puccini +# all eu.puccini puccini.debian.org archvsync 2 # # will push puccini.debian.org, user archvsync, using ssh protocol 2 and the specified 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. +# # staged eu.puccini puccini.debian.org # staged eu.powell powell.debian.org # @@ -30,4 +53,4 @@ # This word has to be on a line itself, followed by a space and a number. # nothing else, not even whitespace. It will trigger a pause of $number # seconds between the two mirrors. If no number is given it defaults to -# 60 seconds. +# 600 seconds. |