summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Dns.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/Dns.hs
parent42d648723d79a116e5fbf840af095c517818cf58 (diff)
parente83fccd24947c0dad36b079b3acd4d645edac01b (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Dns.hs')
-rw-r--r--src/Propellor/Property/Dns.hs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Propellor/Property/Dns.hs b/src/Propellor/Property/Dns.hs
index 2e2710a6..889aece5 100644
--- a/src/Propellor/Property/Dns.hs
+++ b/src/Propellor/Property/Dns.hs
@@ -250,7 +250,7 @@ confStanza c =
cfgline f v = "\t" ++ f ++ " " ++ v ++ ";"
ipblock name l =
[ "\t" ++ name ++ " {" ] ++
- (map (\ip -> "\t\t" ++ fromIPAddr ip ++ ";") l) ++
+ (map (\ip -> "\t\t" ++ val ip ++ ";") l) ++
[ "\t};" ]
mastersblock
| null (confMasters c) = []
@@ -307,17 +307,17 @@ rValue :: Record -> Maybe String
rValue (Address (IPv4 addr)) = Just addr
rValue (Address (IPv6 addr)) = Just addr
rValue (CNAME d) = Just $ dValue d
-rValue (MX pri d) = Just $ show pri ++ " " ++ dValue d
+rValue (MX pri d) = Just $ val pri ++ " " ++ dValue d
rValue (NS d) = Just $ dValue d
rValue (SRV priority weight port target) = Just $ unwords
- [ show priority
- , show weight
- , show port
+ [ val priority
+ , val weight
+ , val port
, dValue target
]
rValue (SSHFP x y s) = Just $ unwords
- [ show x
- , show y
+ [ val x
+ , val y
, s
]
rValue (INCLUDE f) = Just f