summaryrefslogtreecommitdiff
path: root/src/Propellor/Spin.hs
diff options
context:
space:
mode:
authorJoey Hess2017-10-04 13:10:59 -0400
committerJoey Hess2017-10-04 13:10:59 -0400
commit422435f505bf0c6c0e00dc85e0bfd2860b79100e (patch)
treedc0c9ac9b7dee43628525520bd3806d468ad449e /src/Propellor/Spin.hs
parent7898079adb6caa2cb0da4384542f28bd1ce21011 (diff)
avoid propagating non-alias DNS info from container to host
* When the ipv4 and ipv6 properties are used with a container, avoid propagating the address out to the host. * DnsInfo has been replaced with DnsInfoPropagated and DnsInfoUnpropagated. (API change) * Code that used fromDnsInfo . fromInfo changes to use getDnsInfo. * addDNS takes an additional Bool parameter to control whether the DNS info should propagate out of containers. (API change) This commit was sponsored by Trenton Cronholm on Patreon.
Diffstat (limited to 'src/Propellor/Spin.hs')
-rw-r--r--src/Propellor/Spin.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index aeaa4643..88d2b473 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -173,7 +173,7 @@ getSshTarget target hst
return ip
configips = map val $ mapMaybe getIPAddr $
- S.toList $ fromDnsInfo $ fromInfo $ hostInfo hst
+ S.toList $ getDnsInfo $ hostInfo hst
-- Update the privdata, repo url, and git repo over the ssh
-- connection, talking to the user's local propellor instance which is