From d489dcbc4ed286c54e4d1fc6502cf7e074a60dc2 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Fri, 28 Oct 2016 18:11:30 -0400
Subject: factor out function 'configGetCertReqs'

---
 acme-certify.hs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/acme-certify.hs b/acme-certify.hs
index b246a66..71309fb 100644
--- a/acme-certify.hs
+++ b/acme-certify.hs
@@ -233,17 +233,29 @@ readSignedObject =
   B.readFile >=> return .
                  either error (map (X509.decodeSignedObject . pemContent)) . pemParseBS
 
+configGetCertReqs :: Config -> IO [(String, DomainName, [VHostSpec])]
+configGetCertReqs hostsConfig = do
+  fmap concat $ forM (Config.keys hostsConfig) $ \host ->
+    do
+      hostParts <- (Config.subconfig host hostsConfig >>= Config.subconfig "domains") <&> extractObject
+      return $ flip map (HashMap.keys hostParts) $ \domain ->
+        (unpack host, domainName' $ unpack domain, combineSubdomains domain hostParts)
+
+combineSubdomains :: AsPrimitive v => Text -> HashMap.HashMap Text v -> [VHostSpec]
+combineSubdomains domain subs =
+  map (makeVHostSpec (domainName' $ unpack domain)) $
+    sort -- '.' sorts first
+      $ concat $ HashMap.lookup domain subs & toListOf (_Just . _String . to (words . unpack))
+
+extractObject :: Config -> Object
+extractObject (Config _ o) = o
 
 runUpdate :: UpdateOpts -> IO ()
 runUpdate UpdateOpts { .. } = do
   issuerCert <- readX509 letsEncryptX3CrossSigned
 
   config <- Config.load $ fromMaybe defaultUpdateConfigFile updateConfigFile
-  hostsConfig <- Config.subconfig "hosts" config
-  certReqDomains <- fmap concat $ forM (Config.keys hostsConfig) $ \host -> do
-                        hostParts <- (Config.subconfig host hostsConfig >>= Config.subconfig "domains") <&> extractObject
-                        return $ flip map (HashMap.keys hostParts) $ \domain ->
-                          (unpack host, domainName' $ unpack domain, combineSubdomains domain hostParts)
+  certReqDomains <- configGetCertReqs =<< Config.subconfig "hosts" config
 
   globalCertificateDir <- getHomeDirectory <&> (</> if updateStaging then ".acme/fake-certs" else ".acme/certs")
   createDirectoryIfMissing True globalCertificateDir
@@ -281,8 +293,6 @@ runUpdate UpdateOpts { .. } = do
       else print =<< fetchCertificate directoryUrl terms email issuerCert spec
 
   where
-    extractObject :: Config -> Object
-    extractObject (Config _ o) = o
 
     elemOrNull :: Eq a => [a] -> a -> Bool
     elemOrNull xs x = null xs || x `elem` xs
@@ -312,12 +322,6 @@ runUpdate UpdateOpts { .. } = do
         csUserKeys = keys
         csCertificateDir = baseDir </> host </> domainToString domain
 
-    combineSubdomains :: AsPrimitive v => Text -> HashMap.HashMap Text v -> [VHostSpec]
-    combineSubdomains domain subs =
-      map (makeVHostSpec (domainName' $ unpack domain)) $
-        sort -- '.' sorts first
-         $ concat $ HashMap.lookup domain subs & toListOf (_Just . _String . to (words . unpack))
-
 domainToString :: DomainName -> String
 domainToString = unpack . decodeUtf8 . Text.Domain.Validate.toByteString
 
-- 
cgit v1.2.3