cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-10 16:27:52 -04:00
parent 3145346fb8 d8ca671086
commit 17d81326ba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Propellor/Property/Tor.hs
View File

@ -20,11 +20,11 @@ hiddenServiceAvailable :: FilePath -> Int -> Property
hiddenServiceAvailable dir port = hiddenServiceHostName prop hiddenServiceAvailable dir port = hiddenServiceHostName prop
where where
prop = "/etc/tor/torrc" `File.containsLines` prop = "/etc/tor/torrc" `File.containsLines`
[ "HiddenServiceDir " ++ dir [ "HiddenServiceDir " ++ dir
, "HiddenServicePort " ++ show port ++ " 127.0.0.1:" ++ show port , "HiddenServicePort " ++ show port ++ " 127.0.0.1:" ++ show port
] ]
`describe` "hidden service available" `describe` "hidden service available"
`onChange` Service.reloaded "tor" `onChange` Service.reloaded "tor"
hiddenServiceHostName p = adjustProperty p $ \satisfy -> do hiddenServiceHostName p = adjustProperty p $ \satisfy -> do
r <- satisfy r <- satisfy
h <- liftIO $ readFile (dir </> "hostname") h <- liftIO $ readFile (dir </> "hostname")