X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fhomedir%2Fssh%2Fftpmaster-config;h=d90b5a4c421ec9b6fe91b3efbf5bcf0dd0e9e25f;hb=1eeb90f6bf381e10fcd8f0a04437883b443855d5;hp=7c7e7346fdb27e8052d1774f9994dd81dce5a9d2;hpb=96435a89e1ee5581b25eb7b5b1722e987f5b5a44;p=dak.git

diff --git a/config/homedir/ssh/ftpmaster-config b/config/homedir/ssh/ftpmaster-config
index 7c7e7346..d90b5a4c 100644
--- a/config/homedir/ssh/ftpmaster-config
+++ b/config/homedir/ssh/ftpmaster-config
@@ -1,53 +1,38 @@
 Protocol 2
 ConnectTimeout 30
 ServerAliveInterval 30
+ForwardX11 no
+ForwardAgent no
+StrictHostKeyChecking yes
+PasswordAuthentication no
+BatchMode yes
 
 Host bugs-sync
   Hostname bugs-master.debian.org
   User debbugs
   IdentityFile /srv/ftp-master.debian.org/s3kr1t/id_debbugs-vt
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
 
 Host ddtp-sync
   Hostname i18n.debian.net
   User ddtp-dak
   IdentityFile /srv/ftp-master.debian.org/s3kr1t/ddtp-dak.rsa
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
 
 Host morgue-sync
   Hostname stabile.debian.org
   User dak
   IdentityFile /srv/ftp-master.debian.org/s3kr1t/push_morgue
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
 
-Host ries-sync
-  Hostname ries.debian.org
+Host ries-sync1
+  Hostname coccia.debian.org
   User dak
-  IdentityFile /home/dak/.ssh/id_franck
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
+  IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_dd1
+
+Host ries-sync2
+  Hostname coccia.debian.org
+  User dak
+  IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_dd2
 
 Host external-security
   Hostname chopin.debian.org
   User dak
-  IdentityFile /home/dak/.ssh/push_external_files
-  ForwardX11 no
-  ForwardAgent no
-  StrictHostKeyChecking yes
-  PasswordAuthentication no
-  BatchMode yes
+  IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_external_files