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

hlint

Browse source
This commit is contained in:
Joey Hess 2013-10-02 00:33:40 -04:00
parent a3692b4ab2
commit b24b5ca089
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,7 +86,7 @@ sshInputAForm hostnamefield def = SshInput
let h = T.unpack t let h = T.unpack t
let canonname = Just $ defaultHints { addrFlags = [AI_CANONNAME] } let canonname = Just $ defaultHints { addrFlags = [AI_CANONNAME] }
r <- catchMaybeIO $ getAddrInfo canonname (Just h) Nothing r <- catchMaybeIO $ getAddrInfo canonname (Just h) Nothing
return $ case catMaybes . map addrCanonName <$> r of return $ case mapMaybe addrCanonName <$> r of
-- canonicalize input hostname if it had no dot -- canonicalize input hostname if it had no dot
Just (fullname:_) Just (fullname:_)
| '.' `elem` h -> Right t | '.' `elem` h -> Right t
@ -247,9 +247,9 @@ testServer sshinput@(SshInput { inputHostname = Just hn }) = do
, ("rsync", RsyncCapable) , ("rsync", RsyncCapable)
] ]
in if null cs in if null cs
then if reported "loggedin" then UnusableServer $ if reported "loggedin"
then UnusableServer "Neither rsync nor git-annex are installed on the server. Perhaps you should go install them?" then "Neither rsync nor git-annex are installed on the server. Perhaps you should go install them?"
else UnusableServer $ T.pack $ else T.pack $
"Failed to ssh to the server. Transcript: " ++ s "Failed to ssh to the server. Transcript: " ++ s
else UsableServer cs else UsableServer cs
where where
@ -346,7 +346,7 @@ prepSsh' gcrypt origsshdata sshdata keypair a = sshSetup
[ Just $ "mkdir -p " ++ shellEscape remotedir [ Just $ "mkdir -p " ++ shellEscape remotedir
, Just $ "cd " ++ shellEscape remotedir , Just $ "cd " ++ shellEscape remotedir
, if rsynconly then Nothing else Just "if [ ! -d .git ]; then git init --bare --shared; fi" , if rsynconly then Nothing else Just "if [ ! -d .git ]; then git init --bare --shared; fi"
, if (rsynconly || gcrypt) then Nothing else Just "git annex init" , if rsynconly || gcrypt then Nothing else Just "git annex init"
, if needsPubKey origsshdata , if needsPubKey origsshdata
then addAuthorizedKeysCommand (hasCapability origsshdata GitAnnexShellCapable) remotedir . sshPubKey <$> keypair then addAuthorizedKeysCommand (hasCapability origsshdata GitAnnexShellCapable) remotedir . sshPubKey <$> keypair
else Nothing else Nothing
@ -405,7 +405,7 @@ getMakeRsyncNetSharedR = makeSshRepo . rsyncOnly
getMakeRsyncNetGCryptR :: SshData -> RepoKey -> Handler Html getMakeRsyncNetGCryptR :: SshData -> RepoKey -> Handler Html
getMakeRsyncNetGCryptR sshdata NoRepoKey = whenGcryptInstalled $ getMakeRsyncNetGCryptR sshdata NoRepoKey = whenGcryptInstalled $
withNewSecretKey $ getMakeRsyncNetGCryptR sshdata . RepoKey withNewSecretKey $ getMakeRsyncNetGCryptR sshdata . RepoKey
getMakeRsyncNetGCryptR sshdata (RepoKey keyid) = whenGcryptInstalled $ do getMakeRsyncNetGCryptR sshdata (RepoKey keyid) = whenGcryptInstalled $
sshSetup [sshhost, gitinit] [] $ makeGCryptRepo keyid sshdata sshSetup [sshhost, gitinit] [] $ makeGCryptRepo keyid sshdata
where where
sshhost = genSshHost (sshHostName sshdata) (sshUserName sshdata) sshhost = genSshHost (sshHostName sshdata) (sshUserName sshdata)