mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use mangled hostname for gitlab repo when using a dedicated git-annex ssh key

Browse source
This commit is contained in:
Joey Hess 2015-07-27 11:03:58 -04:00
parent 3972312a4f
commit 26d4eaa4e0
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Assistant/WebApp/Configurators/Ssh.hs
View file

@ -708,17 +708,20 @@ parseGitLabUrl (GitLabUrl t) =
testGitLabUrl :: GitLabUrl -> Annex (ServerStatus, Maybe SshData, UUID)
testGitLabUrl glu = case parseGitLabUrl glu of
Nothing -> return (UnusableServer badGitLabUrl, Nothing, NoUUID)
Just sshdata -> do
Just sshdata ->
checkor sshdata $ do
(sshdata', keypair) <- liftIO $ setupSshKeyPair sshdata
checkor sshdata' $
return (ServerNeedsPubKey (sshPubKey keypair), Just sshdata', NoUUID)
where
checkor sshdata ora = do
u <- probeuuid sshdata
if u /= NoUUID
then return (UsableServer (sshCapabilities sshdata), Just sshdata, u)
else ifM (verifysshworks sshdata)
( return (UsableServer (sshCapabilities sshdata), Just sshdata, NoUUID)
, do
(sshdata', keypair) <- liftIO $ setupSshKeyPair sshdata
return (ServerNeedsPubKey (sshPubKey keypair), Just sshdata', NoUUID)
, ora
)
where
probeuuid sshdata = do
r <- inRepo $ Git.Construct.fromRemoteLocation (fromJust $ sshRepoUrl sshdata)
getUncachedUUID . either (const r) fst <$>