diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-04-30 09:06:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-04-30 09:06:08 -0400 |
| commit | bb32fad83db093c30ee6132c5d982cc25fe89bda (patch) | |
| tree | c106cf941167fa16f9489ba2f49410dc38d814af /src/Propellor/Property/Ssh.hs | |
| parent | 345536941eeec4a4562222408d9f4326ce9b2645 (diff) | |
| parent | 14fe4c4d6b5a29be94ecfc0572e0f9a9a081e795 (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Ssh.hs')
| -rw-r--r-- | src/Propellor/Property/Ssh.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index 05098983..c23a121b 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -238,7 +238,7 @@ instance Sem.Semigroup HostKeyInfo where instance Monoid HostKeyInfo where mempty = HostKeyInfo M.empty - mappend = (<>) + mappend = (Sem.<>) userPubKeys :: User -> [(SshKeyType, PubKeyText)] -> Property (HasInfo + UnixLike) userPubKeys u@(User n) l = pureInfoProperty ("ssh pubkey for " ++ n) $ @@ -260,7 +260,7 @@ instance Sem.Semigroup UserKeyInfo where instance Monoid UserKeyInfo where mempty = UserKeyInfo M.empty - mappend = (<>) + mappend = (Sem.<>) -- | Sets up a user with the specified public keys, and the corresponding -- private keys from the privdata. |