diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-03-11 16:52:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-11 16:52:00 -0400 |
| commit | 9a54ba471986b994f10ad332f27639059c18e7e1 (patch) | |
| tree | f940327c4f66f6e38420a402cd36a7b1ad6bc260 /src/Propellor/PrivData.hs | |
| parent | 8a7efe723e4de97065424d1e2396fe0ce5144f56 (diff) | |
don't propagate DNS info from DiskImage chroots
* DiskImage building properties used to propagate DNS info out from
the chroot used to build the disk image to the Host. That is no longer
done, since that chroot only exists as a side effect of the disk image
creation and servers will not be running in it.
* The IsInfo types class's propagateInfo function changed to use a
PropagateInfo data type. (API change)
This is particularly important when using hostChroot, since the host could
well have DNS settings then.
This commit was sponsored by Ole-Morten Duesund on Patreon.
Diffstat (limited to 'src/Propellor/PrivData.hs')
| -rw-r--r-- | src/Propellor/PrivData.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index 8ca51e23..516eda03 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -281,10 +281,10 @@ newtype PrivInfo = PrivInfo { fromPrivInfo :: S.Set (PrivDataField, Maybe PrivDataSourceDesc, HostContext) } deriving (Eq, Ord, Show, Typeable, Monoid) --- PrivInfo is propagated out of containers, so that propellor can see which --- hosts need it. +-- PrivInfo always propagates out of containers, so that propellor +-- can see which hosts need it. instance IsInfo PrivInfo where - propagateInfo _ = True + propagateInfo _ = PropagatePrivData -- | Sets the context of any privdata that uses HostContext to the -- provided name. |