diff options
Diffstat (limited to 'src/Propellor')
| -rw-r--r-- | src/Propellor/Property/Tor.hs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs index 409bb63e..47cd83a2 100644 --- a/src/Propellor/Property/Tor.hs +++ b/src/Propellor/Property/Tor.hs @@ -16,5 +16,28 @@ isBridge = setup `requires` Apt.installed ["tor"] , "Exitpolicy reject *:*" ] `onChange` restarted +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" + hiddenServiceHostName p = adjustProperty p $ \satisfy -> do + r <- satisfy + h <- liftIO $ readFile (dir </> "hostname") + warningMessage $ unlines ["hidden service hostname:", h] + return r + +hiddenService :: FilePath -> Int -> Property +hiddenService dir port = "/etc/tor/torrc" `File.containsLines` + [ "HiddenServiceDir " ++ dir + , "HiddenServicePort " ++ show port ++ " 127.0.0.1:" ++ show port + ] + `describe` ("hidden service (" ++ dir ++ " " ++ show port ++ ") available") + `onChange` Service.reloaded "tor" + restarted :: Property restarted = Service.restarted "tor" |