From d9733ad84f86fa0a43e393388b99974a302a8c66 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 15 Feb 2016 08:50:10 -0800 Subject: [PATCH] Rebase. --- dotfiles/gnupg/gpg-agent.conf | 1 - dotfiles/ssh/config | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dotfiles/gnupg/gpg-agent.conf b/dotfiles/gnupg/gpg-agent.conf index 2456c52..ab47375 100644 --- a/dotfiles/gnupg/gpg-agent.conf +++ b/dotfiles/gnupg/gpg-agent.conf @@ -1,4 +1,3 @@ -enable-ssh-support use-standard-socket default-cache-ttl 7200 default-cache-ttl-ssh 7200 diff --git a/dotfiles/ssh/config b/dotfiles/ssh/config index b45b76e..ef755b5 100644 --- a/dotfiles/ssh/config +++ b/dotfiles/ssh/config @@ -2,6 +2,9 @@ # Never fall back to protocol 1: it's broken Protocol 2 +Host scoreboard + Hostname 104.131.136.220 + # Defaults (May be Overridden) Host * ControlMaster auto