From: martin f. krafft <madduck@madduck.net>
Date: Sat, 3 Jan 2015 13:53:30 +0000 (+0100)
Subject: add support for having a config.local file
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/2230752a67f13410258bf0b7024a760fe9fd1295?ds=sidebyside

add support for having a config.local file
---

diff --git a/.ssh/.gitignore b/.ssh/.gitignore
index 69f3f1c..31eb6b7 100644
--- a/.ssh/.gitignore
+++ b/.ssh/.gitignore
@@ -3,3 +3,4 @@
 /authorized_keys
 /known_hosts
 /config
+/config.local
diff --git a/.ssh/Makefile b/.ssh/Makefile
index 0e26cbb..cfb923b 100644
--- 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##&,' \