do not autologin as root to virt hosts

[etc/ssh.git] / .ssh / Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 0e26cbbc879e10d2b0239ccd6cc6ffdf0241a924..111d692ab90d68329dbb682e7357ed65cc0f7878 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -18,9 +18,15 @@ 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]*) \
            sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
@@ -58,4 +64,5 @@ config: config.in
                    -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
-       esac
+       esac; \
+       sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@