Mercurial > hg > mhoward > dotfiles / changeset

--- a/.profile.common
+++ b/.profile.common
@@ -1,12 +1,6 @@
 # vim: ft=bash
 # simple profile stuff that is common to both zsh and bash
 
-# most ssh versions support include now, see if i can...
-make -s -C ~/.ssh || {
-  umask 077
-  cat ~/.ssh/config.d/* > ~/.ssh/config
-}
-
 umask 027
 
 HISTIGNORE="ls:cd:cd -:pwd:exit:date:privim"

deleted file mode 100644
--- a/.ssh/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Do away with this setup once openssh >=7.3 is readily available just move
-# config.d/10-base to config and add an Include config.d/*
-
-config: config.d/*
-	cat config.d/* > $@ && chmod 600 $@
-
-clean:
-	rm -f config
-
-.PHONY: clean

new file mode 100644
--- /dev/null
+++ b/.ssh/config
@@ -0,0 +1,9 @@
+ControlPath ~/.ssh/mux/%h-%p-%r
+ControlPersist 10
+
+ExitOnForwardFailure yes
+
+Host roomag.org *.roomag.org
+	ForwardAgent yes
+
+Include config.d/*.ssh

deleted file mode 100644
--- a/.ssh/config.d/10-main
+++ /dev/null
@@ -1,14 +0,0 @@
-ControlPath ~/.ssh/mux/%h-%p-%r
-ControlPersist 10
-
-ExitOnForwardFailure yes
-
-Host roomag.org *.roomag.org
-	ForwardAgent yes
-
-Host vagrant
-	Hostname 127.0.0.1
-	Port 2222
-	User vagrant
-	IdentityFile ~/.vagrant.d/insecure_private_key
-

new file mode 100644
--- /dev/null
+++ b/.ssh/config.d/20-vagrant.ssh
@@ -0,0 +1,7 @@
+# vim: ft=sshconfig
+
+Host vagrant
+	Hostname 127.0.0.1
+	Port 2222
+	User vagrant
+	IdentityFile ~/.vagrant.d/insecure_private_key