summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Tor.hs
diff options
context:
space:
mode:
authorJoey Hess2015-04-22 13:50:16 -0400
committerJoey Hess2015-04-22 13:50:16 -0400
commit66a8012a1a1086dd15c18e48fd95b27687d10c87 (patch)
tree6e911e3dcaa1bb18528d22a190d8016f7a9e3d0e /src/Propellor/Property/Tor.hs
parent0fc926934a8e5c736219d0a53790de2fd1e2b87c (diff)
parent4bd933118d9ecb711b19a6db7b94f24c2733d1a2 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/Tor.hs')
-rw-r--r--src/Propellor/Property/Tor.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs
index 7a490824..3af4a70c 100644
--- a/src/Propellor/Property/Tor.hs
+++ b/src/Propellor/Property/Tor.hs
@@ -52,7 +52,7 @@ named n = configured [("Nickname", n')]
torPrivKey :: Context -> Property HasInfo
torPrivKey context = f `File.hasPrivContent` context
- `onChange` File.ownerGroup f user user
+ `onChange` File.ownerGroup f user (userGroup user)
-- install tor first, so the directory exists with right perms
`requires` Apt.installed ["tor"]
where
@@ -140,8 +140,8 @@ hiddenServiceData hn context = combineProperties desc
writeFileProtected f content
, File.mode (takeDirectory f) $ combineModes
[ownerReadMode, ownerWriteMode, ownerExecuteMode]
- , File.ownerGroup (takeDirectory f) user user
- , File.ownerGroup f user user
+ , File.ownerGroup (takeDirectory f) user (userGroup user)
+ , File.ownerGroup f user (userGroup user)
]
)
@@ -157,8 +157,8 @@ varLib = "/var/lib/tor"
varRun :: FilePath
varRun = "/var/run/tor"
-user :: UserName
-user = "debian-tor"
+user :: User
+user = User "debian-tor"
type NickName = String