From 3679a4935335870941806c82e153ca7d0d9b1bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Sipma?= Date: Wed, 12 Nov 2014 22:58:43 +0100 Subject: [PATCH] Tor: change unlines to unwords in description messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Félix Sipma --- src/Propellor/Property/Tor.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs index c23f060..0747d3d 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)