X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/1ee9c4705863e36b1e3fbe9e7525fdcf2b14cb40..5ad825b512eebf0c7d47bab9d82d68be3445692a:/.ssh/Makefile?ds=sidebyside diff --git a/.ssh/Makefile b/.ssh/Makefile index 0e26cbb..493898e 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -18,15 +18,24 @@ authorized_keys: $(wildcard authorized_keys.d/*) echo; \ done > $@ +ifeq ($(strip $(wildcard config.local)),) +LOCAL_CONFIG=/dev/null +else +LOCAL_CONFIG=config.local +endif + SSH_VERSION = $(shell ssh -V 2>&1) -config: config.in - cp $< $@ +config: $(LOCAL_CONFIG) config.in + cat $^ > $@ case "$(SSH_VERSION)" in \ - (OpenSSH_6.[0123]*) \ + (OpenSSH_6.*) \ sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bUpdateHostKeys\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^Match host ,Host ,' \ $@ \ ;; \ - (OpenSSH_5.[012345]*) \ + (OpenSSH_5.*) \ sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ @@ -58,4 +67,8 @@ config: config.in -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ $@ \ ;; \ + esac; \ + case "$$HOSTNAME" in \ + (fishbowl) \ + sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@; \ esac