diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-28 21:32:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-28 21:32:18 -0400 |
| commit | a763d6dd3e62cea8ccde3091a9874994a1e92dd6 (patch) | |
| tree | 7a4069b9e1930f4ea9075db7fcc0a1163c89c8cb /Locations.hs | |
| parent | c597e4ebe25f2ebbc09548fc4607282d1789b523 (diff) | |
use https when .git/annex/privkey.pem and .git/annex/certificate.pem exist (untested)
I have not managed to generate a key that is accepted by the old version of
warp-tls I have here.
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Locations.hs b/Locations.hs index 3739f10f5..74cace156 100644 --- a/Locations.hs +++ b/Locations.hs @@ -34,6 +34,8 @@ module Locations ( gitAnnexScheduleState, gitAnnexTransferDir, gitAnnexCredsDir, + gitAnnexWebCertificate, + gitAnnexWebPrivKey, gitAnnexFeedStateDir, gitAnnexFeedState, gitAnnexMergeDir, @@ -223,6 +225,13 @@ gitAnnexScheduleState r = gitAnnexDir r </> "schedulestate" gitAnnexCredsDir :: Git.Repo -> FilePath gitAnnexCredsDir r = addTrailingPathSeparator $ gitAnnexDir r </> "creds" +{- .git/annex/certificate.pem and .git/annex/key.pem are used by the webapp + - when HTTPS is enabled -} +gitAnnexWebCertificate :: Git.Repo -> FilePath +gitAnnexWebCertificate r = gitAnnexDir r </> "certificate.pem" +gitAnnexWebPrivKey :: Git.Repo -> FilePath +gitAnnexWebPrivKey r = gitAnnexDir r </> "privkey.pem" + {- .git/annex/feeds/ is used to record per-key (url) state by importfeeds -} gitAnnexFeedStateDir :: Git.Repo -> FilePath gitAnnexFeedStateDir r = addTrailingPathSeparator $ gitAnnexDir r </> "feedstate" |