diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-20 20:58:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-20 20:58:36 -0400 |
| commit | 970c4e4a4d8585e4d3a14817e8332200742be48b (patch) | |
| tree | 346323d33dc2545ba2970916f7412b4737bc6b3f /Assistant/Threads | |
| parent | 2d3c592aa4a8dd3483fb924a8818950a867fc4f9 (diff) | |
assistant: Set StrictHostKeyChecking yes when creating ssh remotes, and add it to the configuration for any ssh remotes previously created by the assistant. This avoids repeated prompts by ssh if the host key changes, instead syncing with such a remote will fail. Closes: #732602
Diffstat (limited to 'Assistant/Threads')
| -rw-r--r-- | Assistant/Threads/SanityChecker.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs index 2e6a28759..446ade54f 100644 --- a/Assistant/Threads/SanityChecker.hs +++ b/Assistant/Threads/SanityChecker.hs @@ -15,6 +15,7 @@ import Assistant.Common import Assistant.DaemonStatus import Assistant.Alert import Assistant.Repair +import Assistant.Ssh import qualified Git.LsFiles import qualified Git.Command import qualified Git.Config @@ -53,6 +54,9 @@ sanityCheckerStartupThread startupdelay = namedThreadUnchecked "SanityCheckerSta modifyDaemonStatus_ $ \s -> s { forceRestage = True } ) + {- Fix up ssh remotes set up by past versions of the assistant. -} + liftIO $ fixUpSshRemotes + {- If there's a startup delay, it's done here. -} liftIO $ maybe noop (threadDelaySeconds . Seconds . fromIntegral . durationSeconds) startupdelay |