Tor.named: Fix bug that sometimes caused the property to fail the first time, though retrying succeeded.

May have only been a problem on debian stable, the /var/lib/tor/keys/ was
not created by installing the package.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs
index e5fcdaa4..f7cb6c89 100644
--- a/src/Propellor/Property/Tor.hs
+++ b/src/Propellor/Property/Tor.hs
@@ -54,10 +54,20 @@ named n = configured [("Nickname", n')]
 torPrivKey :: Context -> Property HasInfo
 torPrivKey context = f `File.hasPrivContent` context
 	`onChange` File.ownerGroup f user (userGroup user)
-	-- install tor first, so the directory exists with right perms
-	`requires` Apt.installed ["tor"]
+	`requires` torPrivKeyDirExists
   where
-	f = "/var/lib/tor/keys/secret_id_key"
+	f = torPrivKeyDir </> "secret_id_key"
+
+torPrivKeyDirExists :: Property NoInfo
+torPrivKeyDirExists = File.dirExists torPrivKeyDir
+	`onChange` setperms
+	`requires` installed
+  where
+	setperms = File.ownerGroup torPrivKeyDir user (userGroup user)
+		`before` File.mode torPrivKeyDir 0O2700
+
+torPrivKeyDir :: FilePath
+torPrivKeyDir = "/var/lib/tor/keys"
 
 -- | A tor server (bridge, relay, or exit)
 -- Don't use if you just want to run tor for personal use.