From 2368b0d5af6cdf3b7a3b116c4b1d1a208a6776e0 Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Tue, 11 Nov 2014 11:31:17 +0100 Subject: Tor: rename 'varPath' to 'varLib' Signed-off-by: Félix Sipma --- src/Propellor/Property/Tor.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs index 57fbc715..6a1b1eed 100644 --- a/src/Propellor/Property/Tor.hs +++ b/src/Propellor/Property/Tor.hs @@ -20,20 +20,20 @@ hiddenServiceAvailable :: HostName -> Int -> Property hiddenServiceAvailable hn port = hiddenServiceHostName prop where prop = mainConfig `File.containsLines` - [ unlines ["HiddenServiceDir", varPath hn] + [ unlines ["HiddenServiceDir", varLib hn] , unlines ["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 (varPath hn "hostname") + h <- liftIO $ readFile (varLib hn "hostname") warningMessage $ unlines ["hidden service hostname:", h] return r hiddenService :: HostName -> Int -> Property hiddenService hn port = mainConfig `File.containsLines` - [ unlines ["HiddenServiceDir", varPath hn] + [ unlines ["HiddenServiceDir", varLib hn] , unlines ["HiddenServicePort", show port, "127.0.0.1:" ++ show port] ] `describe` unlines ["hidden service available:", hn, show port] @@ -45,5 +45,5 @@ restarted = Service.restarted "tor" mainConfig :: FilePath mainConfig = "/etc/tor/torrc" -varPath :: FilePath -varPath = "/var/lib/tor" +varLib :: FilePath +varLib = "/var/lib/tor" -- cgit v1.2.3