From 91610aee8f34bb10959bdf6a6e5b16c895c7c1c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Oct 2015 19:06:29 -0400 Subject: improve ssh user key properties * Ssh.keyImported is replaced with Ssh.userKeys. (API change) The new property only gets the private key from the privdata; the public key is provided as a parameter, and so is available as Info that other properties can use. * Ssh.keyImported' is renamed to Ssh.userKeyAt, and also changed to only import the private key from the privdata. (API change) * While Ssh.keyImported and Ssh.keyImported' avoided updating existing keys, the new Ssh.userKeys and Ssh.userKeyAt properties will always update out of date key files. * Ssh.pubKey renamed to Ssh.hostPubKey. (API change) This makes eg, setting up ssh for spin controllers work better. --- src/Propellor/Types/OS.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/Propellor/Types/OS.hs') diff --git a/src/Propellor/Types/OS.hs b/src/Propellor/Types/OS.hs index eb6b5171..b16939c7 100644 --- a/src/Propellor/Types/OS.hs +++ b/src/Propellor/Types/OS.hs @@ -40,8 +40,12 @@ type Release = String type Architecture = String type UserName = String + newtype User = User UserName + deriving (Eq, Ord) + newtype Group = Group String + deriving (Eq, Ord) -- | Makes a Group with the same name as the User. userGroup :: User -> Group -- cgit v1.2.3