summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Tor.hs
diff options
context:
space:
mode:
authorJoey Hess2017-03-02 19:04:43 -0400
committerJoey Hess2017-03-02 19:04:43 -0400
commitdfd95122ccb70d867995b133845eb4b63c054d1b (patch)
tree011318acc6ab8bbb5b94b1fd9b34365bdd61eb0a /src/Propellor/Property/Tor.hs
parent42d648723d79a116e5fbf840af095c517818cf58 (diff)
parente83fccd24947c0dad36b079b3acd4d645edac01b (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Tor.hs')
-rw-r--r--src/Propellor/Property/Tor.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs
index 72bd45f5..24d5b687 100644
--- a/src/Propellor/Property/Tor.hs
+++ b/src/Propellor/Property/Tor.hs
@@ -128,7 +128,7 @@ hiddenService hn port = hiddenService' hn [port]
hiddenService' :: HiddenServiceName -> [Port] -> Property DebianLike
hiddenService' hn ports = ConfFile.adjustSection
- (unwords ["hidden service", hn, "available on ports", intercalate "," (map fromPort ports')])
+ (unwords ["hidden service", hn, "available on ports", intercalate "," (map val ports')])
(== oniondir)
(not . isPrefixOf "HiddenServicePort")
(const (oniondir : onionports))
@@ -139,7 +139,7 @@ hiddenService' hn ports = ConfFile.adjustSection
oniondir = unwords ["HiddenServiceDir", varLib </> hn]
onionports = map onionport ports'
ports' = sort ports
- onionport port = unwords ["HiddenServicePort", fromPort port, "127.0.0.1:" ++ fromPort port]
+ onionport port = unwords ["HiddenServicePort", val port, "127.0.0.1:" ++ val port]
-- | Same as `hiddenService` but also causes propellor to display
-- the onion address of the hidden service.