summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2018-02-24 17:57:25 -0400
committerJoey Hess2018-02-24 17:57:25 -0400
commit910c05d457b45b305dbc595eaaca51fb4a232537 (patch)
treea999634292233f3683c73a9ec955670985d36e6c
parent7fc0e6590e217d92ffcb927dba5e86a51b09eab1 (diff)
parentc16bc5a806d0020f608a35185127430b65253981 (diff)
Merge remote-tracking branch 'felix/dhparams'
-rw-r--r--src/Propellor/Property/Openssl.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Openssl.hs b/src/Propellor/Property/Openssl.hs
index 1967301c..a91b8195 100644
--- a/src/Propellor/Property/Openssl.hs
+++ b/src/Propellor/Property/Openssl.hs
@@ -20,9 +20,9 @@ dhparams = "/etc/ssl/private/dhparams.pem"
safeDhparams :: Property DebianLike
safeDhparams = propertyList "safe dhparams" $ props
- & File.dirExists (takeDirectory file)
+ & File.dirExists (takeDirectory dhparams)
& installed
- & check (not <$> doesFileExist file) (createDhparams file length')
+ & check (not <$> doesFileExist dhparams) (createDhparams dhparams dhparamsLength)
createDhparams :: FilePath -> Int -> Property UnixLike
createDhparams f l = property ("generate new dhparams: " ++ f) $ liftIO $ withUmask 0o0177 $ withFile f WriteMode $ \h ->