From: martin f. krafft <madduck@madduck.net>
Date: Thu, 15 May 2008 11:56:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/9a8d342f1e31da934d02d4e16784e8aa6119093a?hp=10ea56e4561fde4b9805d343093993ab52350f7a

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
---

diff --git a/.ssh/.gitignore b/.ssh/.gitignore
index bf06041..69f3f1c 100644
--- a/.ssh/.gitignore
+++ b/.ssh/.gitignore
@@ -2,3 +2,4 @@
 /id_rsa.pub
 /authorized_keys
 /known_hosts
+/config
diff --git a/.ssh/Makefile b/.ssh/Makefile
index fcd46f6..6de2f30 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,4 +28,11 @@ config: config.in
 	            -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
 	            $@ \
 	    ;; \
+	  (3.9*) \
+	    sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bHashKnownHosts\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bControl(Master|Path)\b.+$$,##UNSUPPORTED##&,' \
+	            $@ \
+	    ;; \
 	esac
diff --git a/.ssh/config.in b/.ssh/config.in
index a3638b0..c0bed14 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -17,6 +17,13 @@ Host scratch.madduck.net | scratch
   User madduck
   HostKeyAlias pulse.madduck.net
 
+Host phd.martin-krafft.net
+  User madduck
+  HostKeyAlias seamus.madduck.net
+Host madduck.net
+  User madduck
+  HostKeyAlias seamus.madduck.net
+
 Host lapse.madduck.net | lapse.oerlikon.madduck.net | lapse
   CheckHostIP no
 
diff --git a/.ssh/known_hosts.d/suspend2.net b/.ssh/known_hosts.d/suspend2.net
new file mode 100644
index 0000000..29ee71b
--- /dev/null
+++ b/.ssh/known_hosts.d/suspend2.net
@@ -0,0 +1 @@
+svn.suspend2.net,130.95.13.29 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwtORmsCYtdtVBhcGeOzU+5bIY/mocLOGU1fAF+uurSSiAYR0kEspOQO8gJwLL1TBc6Hu0jUGDQgWjO+0qlDxjccpYBzcmgsaCBMWoM50KAwEB2gq4KQprHx30LH00Qzh2oOPxsbb8gYyeiUpMe3pNv4bE6Bcru7GycsRBQcAvj0=