From: Peter Palfrader Date: Tue, 15 Sep 2009 21:33:32 +0000 (+0200) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b6fc0c89bbc899e4eda38b983e2b56a42d63e92d;hp=56589c6e34866a00ca46204716c641cd6ef75f2d;p=dsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: reverse zone on slaves another blacklist entry blacklist *@piekmarketing.eu for spam --- diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index e21c09f5..b2b5c5d0 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -165,7 +165,7 @@ command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /o # # schumann.debian.org # -command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/schumann.debian.org/etc",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="212.227.126.54" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuGa85giaserkAzypSxI5lNY1Jb8fvcwjlnXDUcGFW2m/sUwvRMUq7fpxjJc0xi9Xk6RRvzmTsYliD/+NinvGtWUQJPNTe5vpLtK4jrOQbPP3EcEiTLglaEf/nH/SJDjKf0GjUrDOAmTfYSgwp9WlDlnDZXWt6E7zHvm422mEDdQXpEjVnR3FGwLoRo/RL/CIXwIz3dQg+WS1nq7WLUC1ttKH5mY5NRryYZbQsVQm8BIUhLxSHnE1ocyaRHFAA+WVforRhVtFB2cUVFhDrcZNzaZOJD/wE5PphuA0OZ+IWt1JTEyHCM4G2GukXgBLlW1SsVywcSH9OCLAYTxhxZLN9w== da-backup for etc on schumann.debian.org +command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/schumann.debian.org/etc",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="212.227.126.54,2001:8d8:2:1:6564:a62:0:1" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuGa85giaserkAzypSxI5lNY1Jb8fvcwjlnXDUcGFW2m/sUwvRMUq7fpxjJc0xi9Xk6RRvzmTsYliD/+NinvGtWUQJPNTe5vpLtK4jrOQbPP3EcEiTLglaEf/nH/SJDjKf0GjUrDOAmTfYSgwp9WlDlnDZXWt6E7zHvm422mEDdQXpEjVnR3FGwLoRo/RL/CIXwIz3dQg+WS1nq7WLUC1ttKH5mY5NRryYZbQsVQm8BIUhLxSHnE1ocyaRHFAA+WVforRhVtFB2cUVFhDrcZNzaZOJD/wE5PphuA0OZ+IWt1JTEyHCM4G2GukXgBLlW1SsVywcSH9OCLAYTxhxZLN9w== da-backup for etc on schumann.debian.org # # dijkstra.debian.org #