summaryrefslogtreecommitdiff
path: root/acme-certify.hs
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2016-04-09 22:31:48 -0400
committerAndrew Cady <d@jerkface.net>2016-04-09 22:32:18 -0400
commitccb8a70a1e3492adcc18d23de965af4410a684c1 (patch)
tree74ed14f8cf53a66d8e849ef1efc35ac5bf73f2a0 /acme-certify.hs
parente26676c87b074b3933dd1d5c73cd62dcf2ca1995 (diff)
fix erroneous use of "show" on DomainName
Diffstat (limited to 'acme-certify.hs')
-rw-r--r--acme-certify.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/acme-certify.hs b/acme-certify.hs
index 3afcfc3..418fbbb 100644
--- a/acme-certify.hs
+++ b/acme-certify.hs
@@ -206,7 +206,7 @@ runUpdate UpdateOpts { .. } = do
206 csDomains = requestDomains 206 csDomains = requestDomains
207 csSkipDH = True -- TODO: implement 207 csSkipDH = True -- TODO: implement
208 csUserKeys = keys 208 csUserKeys = keys
209 csCertificateDir = baseDir </> host </> (show . fst) (head requestDomains) 209 csCertificateDir = baseDir </> host </> (domainToString . fst) (head requestDomains)
210 210
211 combineSubdomains :: AsPrimitive v => Text -> HashMap.HashMap Text v -> [VHostSpec] 211 combineSubdomains :: AsPrimitive v => Text -> HashMap.HashMap Text v -> [VHostSpec]
212 combineSubdomains domain subs = 212 combineSubdomains domain subs =
@@ -214,11 +214,14 @@ runUpdate UpdateOpts { .. } = do
214 sort -- relying on the fact that '.' sorts first 214 sort -- relying on the fact that '.' sorts first
215 $ concat $ HashMap.lookup domain subs & toListOf (_Just . _String . to (words . unpack)) 215 $ concat $ HashMap.lookup domain subs & toListOf (_Just . _String . to (words . unpack))
216 216
217domainToString :: DomainName -> String
218domainToString = unpack . decodeUtf8 . Text.Domain.Validate.toByteString
219
217data VHostSpec = VHostSpec DomainName (Either DomainName FilePath) deriving Show 220data VHostSpec = VHostSpec DomainName (Either DomainName FilePath) deriving Show
218makeVHostSpec :: DomainName -> String -> VHostSpec 221makeVHostSpec :: DomainName -> String -> VHostSpec
219makeVHostSpec = make 222makeVHostSpec = make
220 where 223 where
221 make (show -> parentDomain) (splitSpec -> (sub, spec)) = 224 make (domainToString -> parentDomain) (splitSpec -> (sub, spec)) =
222 VHostSpec (domainName' $ sub <..> parentDomain) (makeRef spec) 225 VHostSpec (domainName' $ sub <..> parentDomain) (makeRef spec)
223 where 226 where
224 makeRef :: Either String FilePath -> Either DomainName FilePath 227 makeRef :: Either String FilePath -> Either DomainName FilePath