summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-11-13 13:03:37 -0400
committerJoey Hess2014-11-13 13:03:37 -0400
commit4dd53172ec0e5a4832cc5a419482d30d08fbb95f (patch)
tree8ea297fa929b89ed425dd1eef9ded304086891c5
parent72fac5e968ce5548e1b11db2a7239cc0a99f3b11 (diff)
parentcd1a9113143606d7d69acef1c74bd852e315334c (diff)
Merge branch 'joeyconfig'
-rw-r--r--src/Propellor/Property/Tor.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs
index 0747d3dc..7a4e9158 100644
--- a/src/Propellor/Property/Tor.hs
+++ b/src/Propellor/Property/Tor.hs
@@ -38,10 +38,10 @@ hiddenServiceAvailable hn port = hiddenServiceHostName prop
hiddenService :: HiddenServiceName -> Int -> Property
hiddenService hn port = 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` unlines ["hidden service available:", hn, show port]
+ `describe` unwords ["hidden service available:", hn, show port]
`onChange` restarted
hiddenServiceData :: HiddenServiceName -> Context -> Property