Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-10 16:27:52 -04:00
commit 17d81326ba
1 changed files with 5 additions and 5 deletions

View File

@ -20,11 +20,11 @@ hiddenServiceAvailable :: FilePath -> Int -> Property
hiddenServiceAvailable dir port = hiddenServiceHostName prop
where
prop = "/etc/tor/torrc" `File.containsLines`
[ "HiddenServiceDir " ++ dir
, "HiddenServicePort " ++ show port ++ " 127.0.0.1:" ++ show port
]
`describe` "hidden service available"
`onChange` Service.reloaded "tor"
[ "HiddenServiceDir " ++ dir
, "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 (dir </> "hostname")