Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-13 13:03:37 -04:00
commit 4dd53172ec
1 changed files with 3 additions and 3 deletions

View File

@ -38,10 +38,10 @@ hiddenServiceAvailable hn port = hiddenServiceHostName prop
hiddenService :: HiddenServiceName -> Int -> Property hiddenService :: HiddenServiceName -> Int -> Property
hiddenService hn port = mainConfig `File.containsLines` hiddenService hn port = mainConfig `File.containsLines`
[ unlines ["HiddenServiceDir", varLib </> hn] [ unwords ["HiddenServiceDir", varLib </> hn]
, unlines ["HiddenServicePort", show port, "127.0.0.1:" ++ show port] , 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 `onChange` restarted
hiddenServiceData :: HiddenServiceName -> Context -> Property hiddenServiceData :: HiddenServiceName -> Context -> Property