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

another old warp-tls workaround

Browse source
This commit is contained in:
Joey Hess 2014-03-12 12:32:43 -04:00
parent 8d8f8bbbb5
commit a7b3a2b097
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/WebApp.hs
View file

@ -125,9 +125,13 @@ myUrl tlssettings webapp addr = unpack $ yesodRender webapp urlbase DashboardR [
getTlsSettings :: Annex (Maybe TLS.TLSSettings) getTlsSettings :: Annex (Maybe TLS.TLSSettings)
getTlsSettings = do getTlsSettings = do
#ifdef WITH_WEBAPP_HTTPS
cert <- fromRepo gitAnnexWebCertificate cert <- fromRepo gitAnnexWebCertificate
privkey <- fromRepo gitAnnexWebPrivKey privkey <- fromRepo gitAnnexWebPrivKey
ifM (liftIO $ allM doesFileExist [cert, privkey]) ifM (liftIO $ allM doesFileExist [cert, privkey])
( return $ Just $ TLS.tlsSettings cert privkey ( return $ Just $ TLS.tlsSettings cert privkey
, return Nothing , return Nothing
) )
#else
return Nothing
#endif