summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Munin.hs
diff options
context:
space:
mode:
authorJoey Hess2017-03-02 19:04:43 -0400
committerJoey Hess2017-03-02 19:04:43 -0400
commitdfd95122ccb70d867995b133845eb4b63c054d1b (patch)
tree011318acc6ab8bbb5b94b1fd9b34365bdd61eb0a /src/Propellor/Property/Munin.hs
parent42d648723d79a116e5fbf840af095c517818cf58 (diff)
parente83fccd24947c0dad36b079b3acd4d645edac01b (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Munin.hs')
-rw-r--r--src/Propellor/Property/Munin.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Munin.hs b/src/Propellor/Property/Munin.hs
index dd74d91b..6dab25ef 100644
--- a/src/Propellor/Property/Munin.hs
+++ b/src/Propellor/Property/Munin.hs
@@ -46,8 +46,8 @@ hostListFragment' hs os = concatMap muninHost hs
where
muninHost :: Host -> [String]
muninHost h = [ "[" ++ (hostName h) ++ "]"
- , " address " ++ maybe (hostName h) (fromIPAddr . fst) (hOverride h)
- ] ++ (maybe [] (\x -> [" port " ++ (fromPort $ snd x)]) (hOverride h)) ++ [""]
+ , " address " ++ maybe (hostName h) (val . fst) (hOverride h)
+ ] ++ (maybe [] (\x -> [" port " ++ (val $ snd x)]) (hOverride h)) ++ [""]
hOverride :: Host -> Maybe (IPAddr, Port)
hOverride h = lookup (hostName h) os