summaryrefslogtreecommitdiff
path: root/acme-certify.hs
diff options
context:
space:
mode:
Diffstat (limited to 'acme-certify.hs')
-rw-r--r--acme-certify.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/acme-certify.hs b/acme-certify.hs
index 84b7f85..c0116ea 100644
--- a/acme-certify.hs
+++ b/acme-certify.hs
@@ -13,9 +13,9 @@
13module Main where 13module Main where
14 14
15import BasePrelude 15import BasePrelude
16import Network.ACME (HttpProvisioner', Keys (..), 16import Network.ACME (HttpProvisioner, Keys (..),
17 canProvision, certify, 17 canProvisionDir, certify,
18 dispatchProvisioner', ensureWritableDir, 18 dispatchProvisioner, ensureWritableDir,
19 genReq, provisionViaFile, readKeys, 19 genReq, provisionViaFile, readKeys,
20 (</>)) 20 (</>))
21import Network.ACME.Issuer (letsEncryptX1CrossSigned) 21import Network.ACME.Issuer (letsEncryptX1CrossSigned)
@@ -59,7 +59,7 @@ data CmdOpts = CmdOpts {
59} 59}
60 60
61data AcmeCertRequest = AcmeCertRequest { 61data AcmeCertRequest = AcmeCertRequest {
62 acrDomains :: [(DomainName, HttpProvisioner')], 62 acrDomains :: [(DomainName, HttpProvisioner)],
63 acrSkipDH :: Bool, 63 acrSkipDH :: Bool,
64 acrCertificateDir :: FilePath, 64 acrCertificateDir :: FilePath,
65 acrUserKeys :: Keys 65 acrUserKeys :: Keys
@@ -127,7 +127,7 @@ go CmdOpts { .. } = do
127 Just keys <- getOrCreateKeys privKeyFile 127 Just keys <- getOrCreateKeys privKeyFile
128 128
129 unless optSkipProvisionCheck $ 129 unless optSkipProvisionCheck $
130 forM_ requestDomains $ canProvision (const $ Just challengeDir) >=> 130 forM_ requestDomains $ canProvisionDir challengeDir >=>
131 (`unless` error "Error: cannot provision files to web server via challenge directory") 131 (`unless` error "Error: cannot provision files to web server via challenge directory")
132 132
133 let req = AcmeCertRequest {..} 133 let req = AcmeCertRequest {..}
@@ -140,7 +140,7 @@ go CmdOpts { .. } = do
140go' :: URI -> URI -> Maybe EmailAddress -> X509 -> AcmeCertRequest -> IO (Either String ()) 140go' :: URI -> URI -> Maybe EmailAddress -> X509 -> AcmeCertRequest -> IO (Either String ())
141go' directoryUrl terms email issuerCert acr@AcmeCertRequest{..} = do 141go' directoryUrl terms email issuerCert acr@AcmeCertRequest{..} = do
142 let domainKeyFile = acrCertificateDir </> "rsa.key" 142 let domainKeyFile = acrCertificateDir </> "rsa.key"
143 let provision = dispatchProvisioner' acrDomains 143 let provision = dispatchProvisioner acrDomains
144 144
145 Just domainKeys <- getOrCreateKeys domainKeyFile 145 Just domainKeys <- getOrCreateKeys domainKeyFile
146 dh <- saveDhParams acr 146 dh <- saveDhParams acr