diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-12 13:21:28 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-12 13:21:28 +0900 |
| commit | f72439bbeff763bd9d74f66beed864f5764cd7a3 (patch) | |
| tree | e945558e148d05b8b4f09f5b16aa0cc854bcf930 /src/Propellor | |
| parent | 83b19b06f27a36c5ae0af7982663f08ae721e073 (diff) | |
tidy Sbuild.keypairInsecurelyGenerated
Diffstat (limited to 'src/Propellor')
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index fbc0642a..bfa264a8 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -330,12 +330,13 @@ secKeyFile = "/var/lib/sbuild/apt-keys/sbuild-key.sec" -- -- Useful on throwaway build VMs. keypairInsecurelyGenerated :: Property DebianLike -keypairInsecurelyGenerated = check (not <$> doesFileExist secKeyFile) $ go - `requires` Apt.installed ["rng-tools"] +keypairInsecurelyGenerated = check (not <$> doesFileExist secKeyFile) go where go :: Property DebianLike - go = (cmdProperty "rngd" ["-r", "/dev/urandom"] `assume` MadeChange) - `before` keypairGenerated + go = combineProperties "sbuild keyring insecurely generated" $ props + & Apt.installed ["rng-tools"] + & cmdProperty "rngd" ["-r", "/dev/urandom"] `assume` MadeChange + & keypairGenerated -- another script from wiki.d.o/sbuild ccachePrepared :: Property DebianLike |