Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index f92e167..525f2e0 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -130,8 +130,8 @@ command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /o
 #
 # ravel.debian.org
 #
-command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/ravel.debian.org/etc",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="137.82.84.66" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyO8pVefZfCn0daaimKtgauTsQtRAn4JGLXxqSGEjEkXjWaH+pqW/64lADE8eCOflWm3CG5Cx9R6sfFrsShAaxknCRA8Xky6n3l8a0RvL0bUwlmo/dNm8TbBlgYW04hu+WtQUSiYHa3s/TM4dlMl31M0ssW0zFubkeoWyoERKpPuhz57jREJ5m3k5YnsrFKXb9GOvdHojWx/1o53FjVVu9D24KNt+Sgjlh04eQX47qO9EwqBRpM57NrKVQEQal+jTojwEnIWcSjUWuNwgtXsHYKWWuK/jRvRavjO+YvyjlEc/ts9l/nGxZDUqXEPwKbnJ/iGZbKs81Hf7ES/4g2sUkw== da-backup for etc on ravel.debian.org
-command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/ravel.debian.org/d-i",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="137.82.84.66" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA46ILX47Fh0B0msvmkcQ2yEOOUJymLiDyehp82vs9ryTfWbQnSGmiqR6aP4ocQZEe/GgGwhWJvEa9Va0qAHwlCmJfONB2PS54o71AvWBRt5dtMZy4BpdbeXpA88JOLfvG+4oDX0N+5wsd5NWMuuY8af0VkW6dAZ/mDahusoCj/rQf/dS601pAwtDL6p16goVj2n9WJZ0PTYbtZyjQmzyuPvdgo11Cle0MrV5NJpxkZpI2iVBOV08U5eiegAkl/gnvzMuwI7l/sGjcYjkwH+3YJogIj1ea/Sjw+w8w/fUkdKGw+p+XRLFl8iDr8QXwIfhIsjRSpZRqt4/+67NLmoJlow== da-backup for d-i on ravel.debian.org
+command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/ravel.debian.org/etc",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="206.12.19.5" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyO8pVefZfCn0daaimKtgauTsQtRAn4JGLXxqSGEjEkXjWaH+pqW/64lADE8eCOflWm3CG5Cx9R6sfFrsShAaxknCRA8Xky6n3l8a0RvL0bUwlmo/dNm8TbBlgYW04hu+WtQUSiYHa3s/TM4dlMl31M0ssW0zFubkeoWyoERKpPuhz57jREJ5m3k5YnsrFKXb9GOvdHojWx/1o53FjVVu9D24KNt+Sgjlh04eQX47qO9EwqBRpM57NrKVQEQal+jTojwEnIWcSjUWuNwgtXsHYKWWuK/jRvRavjO+YvyjlEc/ts9l/nGxZDUqXEPwKbnJ/iGZbKs81Hf7ES/4g2sUkw== da-backup for etc on ravel.debian.org
+command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/ravel.debian.org/d-i",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="206.12.19.5" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA46ILX47Fh0B0msvmkcQ2yEOOUJymLiDyehp82vs9ryTfWbQnSGmiqR6aP4ocQZEe/GgGwhWJvEa9Va0qAHwlCmJfONB2PS54o71AvWBRt5dtMZy4BpdbeXpA88JOLfvG+4oDX0N+5wsd5NWMuuY8af0VkW6dAZ/mDahusoCj/rQf/dS601pAwtDL6p16goVj2n9WJZ0PTYbtZyjQmzyuPvdgo11Cle0MrV5NJpxkZpI2iVBOV08U5eiegAkl/gnvzMuwI7l/sGjcYjkwH+3YJogIj1ea/Sjw+w8w/fUkdKGw+p+XRLFl8iDr8QXwIfhIsjRSpZRqt4/+67NLmoJlow== da-backup for d-i on ravel.debian.org
 #
 # powell.debian.org
 #