ssh config

baodrate · baodrate · commit 86bd588babe0 · 2019-10-10T22:15:19.000-05:00
diff --git a/install.conf.yaml b/install.conf.yaml
@@ -24,10 +24,10 @@
     ~/.config/termite: termite
     ~/.config/firefox: firefox
     ~/.config/colors: colors
+    ~/.ssh: ssh
 
     # globs
     # -----
-    ~/.ssh/: ssh/*
     ~/bin/: bin/*
 
     # files
diff --git a/ssh/.gitignore b/ssh/.gitignore
@@ -0,0 +1,3 @@
+authorized_keys
+known_hosts
+sockets/*.controlmaster
diff --git a/ssh/config b/ssh/config
@@ -1,16 +1,13 @@
+# vim: set ft=sshconfig:
 Include config.d/*
 
-Host *.ftdna.com
-  User baot
-  IdentityFile ~/.ssh/gpg-bao-gxg.pub
-
 Host github.com
   User git
 
 # default parameters
 Host *
-  IdentitiesOnly no
   ControlMaster auto
+  IdentitiesOnly no
 
   CanonicalizeHostname yes
   CanonicalizeFallbackLocal yes
@@ -28,5 +25,5 @@ Host *
   #   %r    The remote username.
   #   %T    The local tun(4) or tap(4) network interface assigned if tunnel forwarding was requested, or "NONE" otherwise.
   #   %u    The local username.
-  ControlPath ~/.ssh/%r@%n:%h:%p.controlmaster
+  ControlPath ~/.ssh/sockets/%r@%n:%h:%p.controlmaster
   ControlPersist 10m
diff --git a/ssh/config.d/00_work b/ssh/config.d/00_work
@@ -3,11 +3,10 @@ CanonicalDomains int.ftdna.com unx.ftdna.com
 CanonicalizePermittedCNAMEs *.*.ftdna.com:*.*.ftdna.com
 
 Host *.ftdna.com
+  User baot
   IdentityFile ~/.ssh/gpg-bao-gxg.pub
-  ControlMaster auto
   ForwardAgent yes
-  # IdentitiesOnly no
 
-Host github.com gh-bao-gxg
+Host gh-bao-gxg
   IdentityFile ~/.ssh/gpg-bao-gxg.pub
   HostName github.com
diff --git a/ssh/config.d/10_personal b/ssh/config.d/10_personal
@@ -1,15 +1,8 @@
 # vim: set ft=sshconfig:
 CanonicalDomains int.poorboys.casa
 
-Host 144.76.82.49
-  IdentityFile ~/.ssh/gpg-qubidt.pub
-  ControlMaster auto
-  ForwardAgent yes
-
 Host *.poorboys.casa *.baodtrinh.com
   IdentityFile ~/.ssh/gpg-qubidt.pub
-  ControlMaster auto
-  ForwardAgent yes
 
 Host gh-qubidt
   IdentityFile ~/.ssh/gpg-qubidt.pub
diff --git a/ssh/sockets/.gitkeep b/ssh/sockets/.gitkeep

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+authorized_keys`
	`2`	`+known_hosts`
	`3`	`+sockets/*.controlmaster`