From: Joerg Jaspert Date: Tue, 22 Mar 2011 13:09:49 +0000 (+0100) Subject: add the syncscript for ries. also call it hourly X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bf36ff3f98796cf2f9e8ba4b03ad22b1b638686;p=dak add the syncscript for ries. also call it hourly Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly index 73ba6afc..c20f4d1d 100755 --- a/config/debian/cron.hourly +++ b/config/debian/cron.hourly @@ -30,4 +30,7 @@ cat removals.822 >> removals-full.822 $base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc -l $base/log/ $base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/rss/removals.rss +# Tell ries to sync its tree +ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org sync + $scriptsdir/generate-di diff --git a/config/homedir/syncdd.sh b/config/homedir/syncdd.sh new file mode 100755 index 00000000..43219716 --- /dev/null +++ b/config/homedir/syncdd.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +# Copyright (C) 2011 Joerg Jaspert +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + +set -e +set -u +set -E + +export LANG=C +export LC_ALL=C + +export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars +. $SCRIPTVARS + +cleanup() { + rm -f "${HOME}/sync.lock" +} +trap cleanup EXIT TERM HUP INT QUIT + +# not using $lockdir as thats inside the rsync dir, and --delete would +# kick the lock away. Yes we could exclude it, but wth bother? +# +# Also, NEVER use --delete-excluded! +if lockfile -r3 ${HOME}/sync.lock; then + cd $base/ + rsync -aH -B8192 \ + --exclude backup/*.xz \ + --exclude backup/dump* \ + --exclude ftp/ \ + --exclude mirror/ \ + --exclude morgue/ \ + --exclude=lost+found/ \ + --exclude .da-backup.trace \ + --delete \ + --delete-after \ + --timeout 3600 \ + -e 'ssh -o ConnectTimeout=30 -o SetupTimeout=30' \ + ftpmaster-sync:/srv/ftp-master.debian.org/ . + + cd $public/ + rsync -avH -B8192 \ + --exclude mirror \ + --exclude rsync/ \ + --exclude=lost+found/ \ + --exclude .da-backup.trace \ + --exclude web-users/ \ + --delete \ + --delete-after \ + --timeout 3600 \ + -e 'ssh -o ConnectTimeout=30 -o SetupTimeout=30' \ + ftpmaster-sync2:/srv/ftp.debian.org/ . + +else + echo "Couldn't get the lock, not syncing" + exit 0 +fi + + +## ftpmaster-sync is defined in .ssh/config as: +# Host ftpmaster-sync +# Hostname franck.debian.org +# User dak +# IdentityFile ~dak/.ssh/syncftpmaster +# ForwardX11 no +# ForwardAgent no +# StrictHostKeyChecking yes +# PasswordAuthentication no +# BatchMode yes + +## ftpmaster-sync2 is the same, just a second ssh key