summaryrefslogtreecommitdiff
path: root/src/Propellor/Types.hs
diff options
context:
space:
mode:
authorJoey Hess2015-01-15 20:15:01 -0400
committerJoey Hess2015-01-15 20:15:01 -0400
commitc7609c824ba1ce7cdcdf9c646b721db80333f04b (patch)
treed35862ed87d9b61d73d45013085642dc1c0fa2d7 /src/Propellor/Types.hs
parentee7135dbfd87c1be06ce7777e9e21fd6548c420e (diff)
Add descriptions of how to set missing fields to --list-fields output. (Minor API changes)
Diffstat (limited to 'src/Propellor/Types.hs')
-rw-r--r--src/Propellor/Types.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs
index ca3a9582..ab84a46b 100644
--- a/src/Propellor/Types.hs
+++ b/src/Propellor/Types.hs
@@ -176,7 +176,7 @@ data CmdLine
-- | Information about a host.
data Info = Info
{ _os :: Val System
- , _privDataFields :: S.Set (PrivDataField, HostContext)
+ , _privData :: S.Set (PrivDataField, Maybe PrivDataSourceDesc, HostContext)
, _sshPubKey :: M.Map SshKeyType String
, _aliases :: S.Set HostName
, _dns :: S.Set Dns.Record
@@ -190,7 +190,7 @@ instance Monoid Info where
mempty = Info mempty mempty mempty mempty mempty mempty mempty mempty
mappend old new = Info
{ _os = _os old <> _os new
- , _privDataFields = _privDataFields old <> _privDataFields new
+ , _privData = _privData old <> _privData new
, _sshPubKey = _sshPubKey new `M.union` _sshPubKey old
, _aliases = _aliases old <> _aliases new
, _dns = _dns old <> _dns new
@@ -202,7 +202,7 @@ instance Monoid Info where
instance Empty Info where
isEmpty i = and
[ isEmpty (_os i)
- , isEmpty (_privDataFields i)
+ , isEmpty (_privData i)
, isEmpty (_sshPubKey i)
, isEmpty (_aliases i)
, isEmpty (_dns i)