diff options
| author | Joerg Jaspert <joerg@debian.org> | 2008-10-03 22:22:03 +0200 |
|---|---|---|
| committer | Joerg Jaspert <joerg@debian.org> | 2008-10-03 22:22:03 +0200 |
| commit | 708650294841b68bd330f041261c5084c01a2ac8 (patch) | |
| tree | d41f074d3448162968cca3a02dd4f68a8cffd998 | |
| parent | 7e1b496648fb47cbab85cd9304a16c70cd398f4e (diff) | |
runmirrors
allow host wide extra ssh options to be set
Signed-off-by: Joerg Jaspert <joerg@debian.org>
| -rwxr-xr-x | bin/runmirrors | 4 | ||||
| -rw-r--r-- | etc/runmirrors.conf | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/runmirrors b/bin/runmirrors index 5e4f39b..87af148 100755 --- a/bin/runmirrors +++ b/bin/runmirrors @@ -48,6 +48,8 @@ DELAY=${DELAY:-"60"} MIRRORS=${MIRRORS:-"${HOME}/etc/${NAME}.mirror"} # used by log() PROGRAM=${PROGRAM:-"${NAME}-$(hostname -s)"} +# extra ssh options we might want hostwide +SSH_OPTS=${SSH_OPTS:-""} # Make sure we have our log directory mkdir -p ${LOGDIR} @@ -98,7 +100,7 @@ while read MLNAME MHOSTNAME MUSER MPROTO MKEYFILE; do # And finally, push the mirror log "Trigger ${MLNAME}" >> ${LOG} - signal ${MLNAME} ${MHOSTNAME} ${MUSER} ${MPROTO} ${MKEYFILE} + signal ${MLNAME} ${MHOSTNAME} ${MUSER} ${MPROTO} ${MKEYFILE} ${SSH_OPTS} log "Trigger for ${MLNAME} done" >> ${LOG} if [ -n "${HOOK2}" ]; then log "Running hook2: ${HOOK2}" >> ${LOG} diff --git a/etc/runmirrors.conf b/etc/runmirrors.conf index b74a375..220a8e3 100644 --- a/etc/runmirrors.conf +++ b/etc/runmirrors.conf @@ -3,7 +3,6 @@ LOGNAME="archvsync" USER="archvsync" MAIL= PATH="/bin:/usr/bin:$HOME" -HOOKSCRIPT= KEYFILE=${HOME}/.ssh/pushmirror # Hook scripts can be run at various places. |