From d54173086cd471b74c54a1976f6a1c9e46286994 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sat, 6 Jul 2013 23:29:12 +0200 Subject: [PATCH] developer-accessible archive copy moved to coccia.debian.org The developer-accessible copy of the archive moved to coccia.debian.org. As there already is a mirror available, we use that instead of adding a second copy in /srv/ftp-master.debian.org/ftp/. --- config/homedir/ssh/ftpmaster-config | 9 +++++++-- config/homedir/ssh/ftpmaster-mirror-authorized_keys | 4 ++++ scripts/debian/sync-dd | 6 ++---- 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 config/homedir/ssh/ftpmaster-mirror-authorized_keys diff --git a/config/homedir/ssh/ftpmaster-config b/config/homedir/ssh/ftpmaster-config index a4d5d18c..b57c3e0d 100644 --- a/config/homedir/ssh/ftpmaster-config +++ b/config/homedir/ssh/ftpmaster-config @@ -23,15 +23,20 @@ Host morgue-sync IdentityFile /srv/ftp-master.debian.org/s3kr1t/push_morgue Host ries-sync1 - Hostname ries.debian.org + Hostname coccia.debian.org User dak IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_dd1 Host ries-sync2 - Hostname ries.debian.org + Hostname coccia.debian.org User dak IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_dd2 +Host ries-sync3 + Hostname coccia.debian.org + User dak + IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_dd3 + Host external-security Hostname chopin.debian.org User dak diff --git a/config/homedir/ssh/ftpmaster-mirror-authorized_keys b/config/homedir/ssh/ftpmaster-mirror-authorized_keys new file mode 100644 index 00000000..fb93d1b1 --- /dev/null +++ b/config/homedir/ssh/ftpmaster-mirror-authorized_keys @@ -0,0 +1,4 @@ +# keys for scripts/debian/dd-sync +command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/ftp-master.debian.org/" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbFGM5hCwuWz5kVJUAA0lrDb6xJgiHXsGGSnRHJLePRgq06xJbEhLKUpYYNTj928PIYEEWQJb9nZaoRgTgS59aVeo5zt3qT8fGkuB4/XE+qaRWBlWXXaR/DdHh4gNLIws6D8Duny6M/ewrtaOLNca5i2Il9NBSrBrefocZHyoN6fTb2uwXOx8uJ/klcUeVUt+DZNmkF/j9VymmZ+g2892efGrwkcyY42u90xJK+VSHOQBqkRk5eObup5oUNBZr5+WI+GXop9CKy06o/a0KvgIUIBI03zq9zzgIySii/h1YR6YmVgJUUWFc3efap0oOTVVw56Re0QHRdDx+RZZ/5HSl rsync DD-accessible copy of /srv/ftp-master.debian.org, 2012-10-07 +command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/ftp.debian.org/" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSgqmVlgeILSLTE8hHwh5AckbuBf7Dv5n8m5EZFyKzed1Cf7HhOwO/33MNNcR5zl30c3/uZRNXpPLevrGX1vkiEEZ/ddlD/70oEQHS/Ms4pvxikeNO0aVCWQoX2xqR2bZqvRqH5HFr3MUY8PXbD6BLkf2teuc1UNAjsvFQLESKLBp3dONl8jJqdB9QMnmg6rmgeBffN6bogr08TNm+R3t6+6yx7okueh4PZY3eUSBzhelAb/5/3UrSFitM4qFA1Ah/jJe6ZXPF/9QAj97KV2v5iKdpQsFEjXYjtFBn/Yu1kWm6sEH4ki0RZFV7rWidaWu7hW/9emNFVKYj1xXPebk/ rsync DD-accessible copy of /srv/ftp.debian.org/, 2012-10-07 +command="rsync --server -lHogDtpre.iLsf -B8192 --timeout=3600 --delete-after . /srv/backports.debian.org/htdocs/debian-backports/" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/jznuP+RRNK39lFCfBpYxRjHf/GhiA78o7Bujy0yCgLADstRkhNcvbpj910EowKkE06IYu9duDr9vyhNn8ssCzLBe/D3rSmIekPxUy8inTK/4bgvV7TzsZon6yimYNXaqkU7H7ZrfPPAmV3LXVO8cvMs7ELjuKiFdvlBDFOljb4akS/hNaAHUAovoAXXSDe+wBClyTSBRqL0IJfNta8novrUn3f1n9igycNQ8mEVM10A8NFIIpB33zDeYn54hvBdz1G5WDtibc4ZA8XiKFj7r/Z3FZUcCWKFS/OdOi5wnJVgEyunWVrOMj4GliamdPbetdjp/dsNd7TWcrpN1rtYZ ries backports sync, franck, 2013-04-07 diff --git a/scripts/debian/sync-dd b/scripts/debian/sync-dd index 405f06c8..835442a0 100755 --- a/scripts/debian/sync-dd +++ b/scripts/debian/sync-dd @@ -52,10 +52,7 @@ mode="${4}" extra1="" case "${mode}" in - sync) - extra1="${extra1} --exclude /ftp/" - ;; - pool) + pool|sync) ;; *) echo "Unknown mode ${mode}." >&2 @@ -77,6 +74,7 @@ if lockfile -r3 "${lockfile}"; then --exclude "/build-queues/" \ --exclude "/database/*.db" \ --exclude ".da-backup.trace" \ + --exclude "/ftp/" \ --exclude "lost+found" \ --exclude "/lock/" \ --exclude "/mirror/" \ -- 2.39.2