summaryrefslogtreecommitdiff
path: root/src/Propellor/PrivData.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 21:03:08 -0400
committerJoey Hess2014-05-31 21:03:08 -0400
commit2588cab6a2b8e3097fa23b3527d9fa8d9c53d903 (patch)
treec6768a2c122b2d466506edbe856a100d0c7ec033 /src/Propellor/PrivData.hs
parent67549db9e95e03c449f1ad6969605801cd731656 (diff)
parent179301f58dea22feb945004389a56662fe255138 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/PrivData.hs')
-rw-r--r--src/Propellor/PrivData.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs
index ad2c8d22..54f67d73 100644
--- a/src/Propellor/PrivData.hs
+++ b/src/Propellor/PrivData.hs
@@ -13,7 +13,6 @@ import Control.Monad
import "mtl" Control.Monad.Reader
import Propellor.Types
-import Propellor.Attr
import Propellor.Message
import Utility.Monad
import Utility.PartialPrelude
@@ -30,7 +29,7 @@ withPrivData :: PrivDataField -> (String -> Propellor Result) -> Propellor Resul
withPrivData field a = maybe missing a =<< liftIO (getPrivData field)
where
missing = do
- host <- getHostName
+ host <- asks hostName
let host' = if ".docker" `isSuffixOf` host
then "$parent_host"
else host