summaryrefslogtreecommitdiff
path: root/src/Propellor/Types
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor/Types')
-rw-r--r--src/Propellor/Types/OS.hs4
-rw-r--r--src/Propellor/Types/PrivData.hs2
2 files changed, 5 insertions, 1 deletions
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
diff --git a/src/Propellor/Types/PrivData.hs b/src/Propellor/Types/PrivData.hs
index 1cf22aa9..32b51c4b 100644
--- a/src/Propellor/Types/PrivData.hs
+++ b/src/Propellor/Types/PrivData.hs
@@ -12,7 +12,7 @@ import qualified Data.ByteString.Lazy as L
-- It's fine to add new constructors.
data PrivDataField
= DockerAuthentication
- | SshPubKey SshKeyType UserName
+ | SshPubKey SshKeyType UserName -- ^ Not used anymore, but retained to avoid breaking serialization of old files
| SshPrivKey SshKeyType UserName -- ^ For host key, use empty UserName
| SshAuthorizedKeys UserName
| Password UserName