# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1484925686 18000
# Node ID 2b08e0404a8da04b234e76bd95b3ec83182a0dcf
# Parent  78858f1e23b8c7912432a335de8c865740cf77f0
Allow local ssh configs

diff --git a/.profile.common b/.profile.common
--- a/.profile.common
+++ b/.profile.common
@@ -1,5 +1,7 @@
 # simple profile stuff that is common to both zsh and bash
 
+make -s -C ~/.ssh &
+
 export EDITOR=vim
 export LESS=-Ri
 export PERL_CPANM_OPT='-nq --prompt'
diff --git a/.ssh/Makefile b/.ssh/Makefile
new file mode 100644
--- /dev/null
+++ b/.ssh/Makefile
@@ -0,0 +1,7 @@
+config: config.d/*
+	cat config.d/* > $@
+
+clean:
+	rm -f config
+
+.PHONY: clean
diff --git a/.ssh/config.d/10-main b/.ssh/config.d/10-main
new file mode 100644
--- /dev/null
+++ b/.ssh/config.d/10-main
@@ -0,0 +1,15 @@
+ControlPath ~/.ssh/mux/%h-%p-%r
+ControlPersist 10
+
+ExitOnForwardFailure yes
+
+Host *
+        # CVE-2016-0778 workaround
+	UseRoaming no
+
+Host vagrant
+	Hostname 127.0.0.1
+	Port 2222
+	User vagrant
+	IdentityFile ~/.vagrant.d/insecure_private_key
+