From 88965364b417b2dd0f4c7b3e312f39aec94d4a1f Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 9 Apr 2016 00:01:51 -0400 Subject: Move generation of CSR into `certify` function --- acme-certify.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'acme-certify.hs') diff --git a/acme-certify.hs b/acme-certify.hs index c0116ea..0ac7a7b 100644 --- a/acme-certify.hs +++ b/acme-certify.hs @@ -140,13 +140,11 @@ go CmdOpts { .. } = do go' :: URI -> URI -> Maybe EmailAddress -> X509 -> AcmeCertRequest -> IO (Either String ()) go' directoryUrl terms email issuerCert acr@AcmeCertRequest{..} = do let domainKeyFile = acrCertificateDir "rsa.key" - let provision = dispatchProvisioner acrDomains Just domainKeys <- getOrCreateKeys domainKeyFile dh <- saveDhParams acr - certReq <- genReq domainKeys $ map fst acrDomains - certificate <- certify directoryUrl acrUserKeys ((,) terms <$> email) provision certReq + certificate <- certify directoryUrl acrUserKeys ((,) terms <$> email) domainKeys acrDomains forM certificate $ saveCertificate issuerCert dh domainKeys acr saveDhParams :: AcmeCertRequest -> IO (Maybe DHP) -- cgit v1.2.3