From b8493e549fe472021a545b665e49fff779fb4241 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Fri, 8 Apr 2016 23:50:58 -0400
Subject: More renames/cleanup related to HttpProvisioner

---
 acme-certify.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'acme-certify.hs')

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 @@
 module Main where
 
 import           BasePrelude
-import           Network.ACME         (HttpProvisioner', Keys (..),
-                                       canProvision, certify,
-                                       dispatchProvisioner', ensureWritableDir,
+import           Network.ACME         (HttpProvisioner, Keys (..),
+                                       canProvisionDir, certify,
+                                       dispatchProvisioner, ensureWritableDir,
                                        genReq, provisionViaFile, readKeys,
                                        (</>))
 import           Network.ACME.Issuer  (letsEncryptX1CrossSigned)
@@ -59,7 +59,7 @@ data CmdOpts = CmdOpts {
 }
 
 data AcmeCertRequest = AcmeCertRequest {
-      acrDomains        :: [(DomainName, HttpProvisioner')],
+      acrDomains        :: [(DomainName, HttpProvisioner)],
       acrSkipDH         :: Bool,
       acrCertificateDir :: FilePath,
       acrUserKeys       :: Keys
@@ -127,7 +127,7 @@ go CmdOpts { .. } = do
   Just keys <- getOrCreateKeys privKeyFile
 
   unless optSkipProvisionCheck $
-    forM_ requestDomains $ canProvision (const $ Just challengeDir) >=>
+    forM_ requestDomains $ canProvisionDir challengeDir >=>
       (`unless` error "Error: cannot provision files to web server via challenge directory")
 
   let req = AcmeCertRequest {..}
@@ -140,7 +140,7 @@ 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
+  let provision     = dispatchProvisioner acrDomains
 
   Just domainKeys <- getOrCreateKeys domainKeyFile
   dh <- saveDhParams acr
-- 
cgit v1.2.3