diff options
author | Andrew Cady <d@jerkface.net> | 2016-05-01 00:12:24 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2016-05-01 00:16:03 -0400 |
commit | 3f29357ec3b42450a01ef58d20df1534bf126466 (patch) | |
tree | 020dd541f6eaf758906acde20e6ccf032b45c7a4 /acme-certify.hs | |
parent | 6ed2f2ef03570cd234c7cb6ccca38f953b8c063d (diff) |
actually respect --config command line option
Diffstat (limited to 'acme-certify.hs')
-rw-r--r-- | acme-certify.hs | 5 |
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 | |||
55 | import Data.PEM (pemContent, pemParseBS) | 55 | import Data.PEM (pemContent, pemParseBS) |
56 | import qualified Data.X509 as X509 | 56 | import qualified Data.X509 as X509 |
57 | 57 | ||
58 | defaultUpdateConfigFile :: FilePath | ||
59 | defaultUpdateConfigFile = "config.yaml" | ||
60 | |||
58 | stagingDirectoryUrl, liveDirectoryUrl, defaultTerms :: URI | 61 | stagingDirectoryUrl, liveDirectoryUrl, defaultTerms :: URI |
59 | Just liveDirectoryUrl = parseAbsoluteURI "https://acme-v01.api.letsencrypt.org/directory" | 62 | Just liveDirectoryUrl = parseAbsoluteURI "https://acme-v01.api.letsencrypt.org/directory" |
60 | Just stagingDirectoryUrl = parseAbsoluteURI "https://acme-staging.api.letsencrypt.org/directory" | 63 | Just stagingDirectoryUrl = parseAbsoluteURI "https://acme-staging.api.letsencrypt.org/directory" |
@@ -235,7 +238,7 @@ runUpdate :: UpdateOpts -> IO () | |||
235 | runUpdate UpdateOpts { .. } = do | 238 | runUpdate 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 |