summaryrefslogtreecommitdiff
path: root/acme-certify.hs
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2016-05-01 00:12:24 -0400
committerAndrew Cady <d@jerkface.net>2016-05-01 00:16:03 -0400
commit3f29357ec3b42450a01ef58d20df1534bf126466 (patch)
tree020dd541f6eaf758906acde20e6ccf032b45c7a4 /acme-certify.hs
parent6ed2f2ef03570cd234c7cb6ccca38f953b8c063d (diff)
actually respect --config command line option
Diffstat (limited to 'acme-certify.hs')
-rw-r--r--acme-certify.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/acme-certify.hs b/acme-certify.hs
index 84c26c6..0215219 100644
--- a/acme-certify.hs
+++ b/acme-certify.hs
@@ -55,6 +55,9 @@ import qualified Data.ByteString as B
55import Data.PEM (pemContent, pemParseBS) 55import Data.PEM (pemContent, pemParseBS)
56import qualified Data.X509 as X509 56import qualified Data.X509 as X509
57 57
58defaultUpdateConfigFile :: FilePath
59defaultUpdateConfigFile = "config.yaml"
60
58stagingDirectoryUrl, liveDirectoryUrl, defaultTerms :: URI 61stagingDirectoryUrl, liveDirectoryUrl, defaultTerms :: URI
59Just liveDirectoryUrl = parseAbsoluteURI "https://acme-v01.api.letsencrypt.org/directory" 62Just liveDirectoryUrl = parseAbsoluteURI "https://acme-v01.api.letsencrypt.org/directory"
60Just stagingDirectoryUrl = parseAbsoluteURI "https://acme-staging.api.letsencrypt.org/directory" 63Just stagingDirectoryUrl = parseAbsoluteURI "https://acme-staging.api.letsencrypt.org/directory"
@@ -235,7 +238,7 @@ runUpdate :: UpdateOpts -> IO ()
235runUpdate UpdateOpts { .. } = do 238runUpdate UpdateOpts { .. } = do
236 issuerCert <- readX509 letsEncryptX3CrossSigned 239 issuerCert <- readX509 letsEncryptX3CrossSigned
237 240
238 config <- Config.load "config.yaml" 241 config <- Config.load $ fromMaybe defaultUpdateConfigFile updateConfigFile
239 hostsConfig <- Config.subconfig "hosts" config 242 hostsConfig <- Config.subconfig "hosts" config
240 certReqDomains <- fmap concat $ forM (Config.keys hostsConfig) $ \host -> do 243 certReqDomains <- fmap concat $ forM (Config.keys hostsConfig) $ \host -> do
241 hostParts <- (Config.subconfig host hostsConfig >>= Config.subconfig "domains") <&> extractObject 244 hostParts <- (Config.subconfig host hostsConfig >>= Config.subconfig "domains") <&> extractObject