diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-12 12:32:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-12 12:32:43 -0400 |
| commit | 364ca67908abd87c9be43bc68ac8ef2d8db68514 (patch) | |
| tree | d951f725bc8b7512c00789d704b11d2c77783e0b /Assistant | |
| parent | b30902f568c33c8790f45b60201e8032f1f7bcf4 (diff) | |
another old warp-tls workaround
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 7b24ccea1..f90f74287 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -125,9 +125,13 @@ myUrl tlssettings webapp addr = unpack $ yesodRender webapp urlbase DashboardR [ getTlsSettings :: Annex (Maybe TLS.TLSSettings) getTlsSettings = do +#ifdef WITH_WEBAPP_HTTPS cert <- fromRepo gitAnnexWebCertificate privkey <- fromRepo gitAnnexWebPrivKey ifM (liftIO $ allM doesFileExist [cert, privkey]) ( return $ Just $ TLS.tlsSettings cert privkey , return Nothing ) +#else + return Nothing +#endif |