diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-04 19:52:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-04 19:52:09 -0400 |
| commit | e22002a7a99ceaaf193a6aa83d3c03e256d79f52 (patch) | |
| tree | 8a6460e3da5abfd0109d40e518fd1a8f233dc35b /src/Propellor/Property/Ssh.hs | |
| parent | 2de60a902794669b40fae8c7135f989ccca2f8d5 (diff) | |
| parent | 0794dfbd7c6f854c3e517486be0722e4cf61db34 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/Ssh.hs')
| -rw-r--r-- | src/Propellor/Property/Ssh.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index b6ed476e..238e67e4 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -9,6 +9,7 @@ module Propellor.Property.Ssh ( hostKeys, hostKey, pubKey, + getPubKey, keyImported, knownHost, authorizedKeys, @@ -120,7 +121,7 @@ hostKey context keytype pub = combineProperties desc desc = "ssh host key configured (" ++ fromKeyType keytype ++ ")" install writer ispub key = do let f = keyFile keytype ispub - s <- liftIO $ readFileStrict f + s <- liftIO $ catchDefaultIO "" $ readFileStrict f if s == key then noChange else makeChange $ writer f key |