summaryrefslogtreecommitdiff
path: root/src/Propellor/Types/Attr.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 18:02:56 -0400
committerJoey Hess2014-05-31 18:04:41 -0400
commit5fc4b006517051e937cbfa13b5f7ccbc25460c1b (patch)
treef99b7dcf46d262f13aa80fb39c8fcc1a67c951a9 /src/Propellor/Types/Attr.hs
parentd3ac75a1a29e9eda60b78d25e7352d4a2d5713cc (diff)
remove now redundant _hostname field of Attr
Now that Host includes _hostName, it's redundant to also keep it in Attr. This requires changing the reader monad to operate on the whole Host.
Diffstat (limited to 'src/Propellor/Types/Attr.hs')
-rw-r--r--src/Propellor/Types/Attr.hs15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/Propellor/Types/Attr.hs b/src/Propellor/Types/Attr.hs
index 8b7d3b09..7f0add10 100644
--- a/src/Propellor/Types/Attr.hs
+++ b/src/Propellor/Types/Attr.hs
@@ -6,10 +6,9 @@ import qualified Propellor.Types.Dns as Dns
import qualified Data.Set as S
import qualified Data.Map as M
--- | The attributes of a host. For example, its hostname.
+-- | The attributes of a host.
data Attr = Attr
- { _hostname :: HostName
- , _os :: Maybe System
+ { _os :: Maybe System
, _sshPubKey :: Maybe String
, _dns :: S.Set Dns.Record
, _namedconf :: M.Map Dns.Domain Dns.NamedConf
@@ -20,8 +19,7 @@ data Attr = Attr
instance Eq Attr where
x == y = and
- [ _hostname x == _hostname y
- , _os x == _os y
+ [ _os x == _os y
, _dns x == _dns y
, _namedconf x == _namedconf y
, _sshPubKey x == _sshPubKey y
@@ -33,8 +31,7 @@ instance Eq Attr where
instance Show Attr where
show a = unlines
- [ "hostname " ++ _hostname a
- , "OS " ++ show (_os a)
+ [ "OS " ++ show (_os a)
, "sshPubKey " ++ show (_sshPubKey a)
, "dns " ++ show (_dns a)
, "namedconf " ++ show (_namedconf a)
@@ -42,7 +39,7 @@ instance Show Attr where
, "docker run params " ++ show (map (\mk -> mk "") (_dockerRunParams a))
]
-newAttr :: HostName -> Attr
-newAttr hn = Attr hn Nothing Nothing S.empty M.empty Nothing []
+newAttr :: Attr
+newAttr = Attr Nothing Nothing S.empty M.empty Nothing []
type SetAttr = Attr -> Attr