diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-12 18:09:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-12 18:09:27 -0400 |
| commit | 72fac5e968ce5548e1b11db2a7239cc0a99f3b11 (patch) | |
| tree | 718d7e934d54f9b11586014e80ddfe7d45d1f442 | |
| parent | 256106779838c30450f5ad505fd0b90f375fe9be (diff) | |
| parent | 3679a4935335870941806c82e153ca7d0d9b1bb6 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | src/Propellor/Property/Tor.hs | 8 |
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) |