diff options
author | Joey Hess <joey@kitenet.net> | 2014-07-23 12:23:44 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-07-23 12:23:44 -0400 |
commit | ecc275cfeb9dc2c18abe525f3a93aad7614e1a0c (patch) | |
tree | fbee0dde5d3b27d4482185790ab3a7812a8a1154 /src/Propellor/Types | |
parent | d393b8fc533b29ea44412b5728e3467fd1521254 (diff) |
propellor spin
Diffstat (limited to 'src/Propellor/Types')
-rw-r--r-- | src/Propellor/Types/Info.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Types/Info.hs b/src/Propellor/Types/Info.hs index 8856e06f..de072aa0 100644 --- a/src/Propellor/Types/Info.hs +++ b/src/Propellor/Types/Info.hs @@ -12,6 +12,7 @@ data Info = Info { _os :: Val System , _privDataFields :: S.Set (PrivDataField, Context) , _sshPubKey :: Val String + , _aliases :: S.Set HostName , _dns :: S.Set Dns.Record , _namedconf :: Dns.NamedConfMap , _dockerinfo :: DockerInfo @@ -19,11 +20,12 @@ data Info = Info deriving (Eq, Show) instance Monoid Info where - mempty = Info mempty mempty mempty mempty mempty mempty + mempty = Info mempty mempty mempty mempty mempty mempty mempty mappend old new = Info { _os = _os old <> _os new , _privDataFields = _privDataFields old <> _privDataFields new , _sshPubKey = _sshPubKey old <> _sshPubKey new + , _aliases = _aliases old <> _aliases new , _dns = _dns old <> _dns new , _namedconf = _namedconf old <> _namedconf new , _dockerinfo = _dockerinfo old <> _dockerinfo new |