diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-10-26 16:41:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-10-26 16:41:34 -0400 |
| commit | e356796fc7ee493ff6b6a7e9cbcbc2971ab23729 (patch) | |
| tree | e65a038719daea8c871a435cb0d03ddcbd482783 /Annex/Locations.hs | |
| parent | d3c4be40c05e107b39b08a918dfb3ec991444d6e (diff) | |
Run ssh with ServerAliveInterval 60
So that stalled transfers will be noticed within about 3 minutes,
even if TCPKeepAlive is disabled or doesn't work.
Rather than setting with -o, use -F with another config file,
so that any settings in ~/.ssh/config or /etc/ssh/ssh_config overrides this.
Diffstat (limited to 'Annex/Locations.hs')
| -rw-r--r-- | Annex/Locations.hs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Annex/Locations.hs b/Annex/Locations.hs index a6af4d417..9f829fda1 100644 --- a/Annex/Locations.hs +++ b/Annex/Locations.hs @@ -63,6 +63,7 @@ module Annex.Locations ( gitAnnexUrlFile, gitAnnexTmpCfgFile, gitAnnexSshDir, + gitAnnexSshConfig, gitAnnexRemotesDir, gitAnnexAssistantDefaultDir, HashLevels(..), @@ -402,6 +403,10 @@ gitAnnexTmpCfgFile r = gitAnnexDir r </> "config.tmp" gitAnnexSshDir :: Git.Repo -> FilePath gitAnnexSshDir r = addTrailingPathSeparator $ gitAnnexDir r </> "ssh" +{- .git/annex/ssh.config is used to configure ssh. -} +gitAnnexSshConfig :: Git.Repo -> FilePath +gitAnnexSshConfig r = gitAnnexDir r </> "ssh.config" + {- .git/annex/remotes/ is used for remote-specific state. -} gitAnnexRemotesDir :: Git.Repo -> FilePath gitAnnexRemotesDir r = addTrailingPathSeparator $ gitAnnexDir r </> "remotes" |