summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorFélix Sipma2014-11-12 22:58:43 +0100
committerJoey Hess2014-11-12 18:09:21 -0400
commit3679a4935335870941806c82e153ca7d0d9b1bb6 (patch)
treecb2d6d39c99951a11370462c8367e6b5e7f3fada /src/Propellor
parente7d2c38a59c8ffed26da04e7e46d1ebbdfe08c5e (diff)
Tor: change unlines to unwords in description messages
Signed-off-by: Félix Sipma <felix.sipma@no-log.org>
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Tor.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs
index c23f060a..0747d3dc 100644
--- a/src/Propellor/Property/Tor.hs
+++ b/src/Propellor/Property/Tor.hs
@@ -25,15 +25,15 @@ hiddenServiceAvailable :: HiddenServiceName -> Int -> Property
hiddenServiceAvailable hn port = hiddenServiceHostName prop
where
prop = mainConfig `File.containsLines`
- [ unlines ["HiddenServiceDir", varLib </> hn]
- , unlines ["HiddenServicePort", show port, "127.0.0.1:" ++ show port]
+ [ unwords ["HiddenServiceDir", varLib </> hn]
+ , unwords ["HiddenServicePort", show port, "127.0.0.1:" ++ show port]
]
`describe` "hidden service available"
`onChange` Service.reloaded "tor"
hiddenServiceHostName p = adjustProperty p $ \satisfy -> do
r <- satisfy
h <- liftIO $ readFile (varLib </> hn </> "hostname")
- warningMessage $ unlines ["hidden service hostname:", h]
+ warningMessage $ unwords ["hidden service hostname:", h]
return r
hiddenService :: HiddenServiceName -> Int -> Property
@@ -50,7 +50,7 @@ hiddenServiceData hn context = combineProperties desc
, installonion "private_key"
]
where
- desc = unlines ["hidden service data available in", varLib </> hn]
+ desc = unwords ["hidden service data available in", varLib </> hn]
installonion f = withPrivData (PrivFile $ varLib </> hn </> f) context $ \getcontent ->
property desc $ getcontent $ install $ varLib </> hn </> f
install f content = ifM (liftIO $ doesFileExist f)