Commit fb61cd39 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix SSH configs for Windows

parent ac11474b

.shell/lib/ssh.sh

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ fi 


ssh_version() {

	eval `${SSH_BIN} -V 2>&1 | sed -n \

		's/OpenSSH_\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/SSH_MAJOR="\1" SSH_MINOR="\2"; return 0/p'`

		's/OpenSSH[a-zA-Z_]*_\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/SSH_MAJOR="\1" SSH_MINOR="\2"; return 0/p'`

	echo >&2 "Failed to get SSH version"

	return 1

}

.ssh/config

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Host gateway gw1.ext.kodo.org.uk 
	CheckHostIP no



Host !gw1.ext.kodo.org.uk *.net.kodo.org.uk 10.56.*

	ProxyCommand ~/.ssh/forward %h %p ssh-port-user@gw1.ext.kodo.org.uk

	ProxyCommand sh -c 'exec ~/.ssh/forward %h %p ssh-port-user@gw1.ext.kodo.org.uk'

	CheckHostIP no
@@ -53,7 +53,7 @@ Host localhost 
## REQUIRES: (ControlPersist) 5.6

## REQUIRES: (%C) 6.7

#@fallback: test ${PLATFORM:-unknown} != windows

Match exec "test ${PLATFORM:-unknown} != windows"

Match exec "sh -c 'test ${PLATFORM:-unknown} != windows'"

	ControlMaster auto

	ControlPath ~/.ssh/%C.sock

	ControlPersist 2h