X-Git-Url: https://git.siccegge.de//index.cgi?p=dotfiles%2Fssh.git;a=blobdiff_plain;f=config;h=64456c8fe7574fb571d84ecf25125606705d764b;hp=c56485dd4695b248411ed62bb124fddf90a20327;hb=HEAD;hpb=ead54e15bbc5e4be6c239e950212849409f2d42e

diff --git a/config b/config
index c56485d..64456c8 100644
--- a/config
+++ b/config
@@ -1,11 +1,4 @@
-HashKnownHosts no
-ServerAliveInterval 300
-ControlMaster=auto
-MACs hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512
-KexAlgorithms diffie-hellman-group-exchange-sha256,curve25519-sha256@libssh.org
-HostKeyAlgorithms ssh-ed25519,ssh-rsa
-FingerprintHash sha256
-Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr
+PermitLocalCommand no
 
 Host git.siccegge.de
 	User git
@@ -18,9 +11,15 @@ Host git.faust.ninja
 Host *.debian.org
 	User christoph
 	VerifyHostKeyDNS yes
+	PubkeyAcceptedKeyTypes ssh-rsa
 
 Host *.sourceforge.net
 	User christophegger
+	PubkeyAcceptedKeyTypes ssh-rsa
+
+Host gcc*.fsffrance.org
+       User christoph
+       PubkeyAcceptedKeyTypes ssh-rsa
 
 Host *.informatik.uni-erlangen.de
 	User siccegge
@@ -38,3 +37,16 @@ Host *.sieglitzhof.net
 
 Host *.faust.ninja
 	VerifyHostKeyDNS yes
+
+Host *
+	HashKnownHosts no
+	ServerAliveInterval 300
+	ControlMaster auto
+	ControlPersist 30
+	ControlPath ~/.ssh/master/%C
+	MACs hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha2-256,hmac-sha2-512
+	KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
+	HostKeyAlgorithms ssh-ed25519,ssh-rsa
+	PubkeyAcceptedKeyTypes ssh-ed25519
+	FingerprintHash sha256
+	Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr