summaryrefslogtreecommitdiff
path: root/.config/ssh
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-21 16:14:33 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-21 16:14:33 -0400
commitc5fb55843c66f1ff6d4491009d9cf9781c0a3d7f (patch)
tree2192e1abfb7e85d866a5fd9efffb221bed0344cb /.config/ssh
parent81bdd77380a77945931687b334d47c95b7492a8d (diff)
parentd65775a22e1648eca8e74389a4d9c1c299017cf3 (diff)
Merge remote-tracking branch 'origin/master' into build64-par
Diffstat (limited to '.config/ssh')
-rw-r--r--.config/ssh/.gitignore1
-rw-r--r--.config/ssh/config5
2 files changed, 3 insertions, 3 deletions
diff --git a/.config/ssh/.gitignore b/.config/ssh/.gitignore
new file mode 100644
index 0000000..00977c6
--- /dev/null
+++ b/.config/ssh/.gitignore
@@ -0,0 +1 @@
+id_*
diff --git a/.config/ssh/config b/.config/ssh/config
index c020c5e..b6e53d6 100644
--- a/.config/ssh/config
+++ b/.config/ssh/config
@@ -1,7 +1,7 @@
Host *
Protocol 2
ControlMaster auto
- ControlPath ~/.ssh/master-%r@%h:%p
+ ControlPath ~/.sessions/ssh-%r@%h:%p
Compression yes
Host lore
@@ -20,6 +20,5 @@ Host rshg054
Port 1863
HostName parabolagnulinux.org
-Host lukeshu
+Host lukeshu.com
Port 1863
- HostName 199.180.255.147