From 3961bcf486ebb496cc9a617d8cd8ebfbdde6256a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Mar 2014 12:32:43 -0400 Subject: [PATCH] another old warp-tls workaround (cherry picked from commit a7b3a2b097697dcf5f8e0f49adde7744f7e6015f) --- Assistant/Threads/WebApp.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 7b24ccea13..f90f742870 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