summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorSean Whitton2016-06-19 16:14:59 +0900
committerSean Whitton2016-06-19 16:14:59 +0900
commit0375288f012cf17b3f709f1e98bde24c3d1f97a7 (patch)
tree6fe3b402864c5f2665c97d0bada87dbc1d34e684 /src/Propellor/Property
parentf33b0948218e7b3d510f6bf37785cda107a630d8 (diff)
Ccache.hasCache chmods cache root setgid
This should fix <http://propellor.branchable.com/forum/Bug_with_Sbuild/>. Thank you to Fred Picca for reporting and then also finding a fix for the problem.
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Ccache.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Propellor/Property/Ccache.hs b/src/Propellor/Property/Ccache.hs
index 34ed6761..a573cf63 100644
--- a/src/Propellor/Property/Ccache.hs
+++ b/src/Propellor/Property/Ccache.hs
@@ -95,8 +95,11 @@ group@(Group g) `hasCache` limit = (make `requires` installed) <!> delete
& File.dirExists path
& File.ownerGroup path (User "root") group
& File.mode path (combineModes $
- readModes ++ executeModes
- ++ [ownerWriteMode, groupWriteMode])
+ readModes ++ executeModes ++
+ [ ownerWriteMode
+ , groupWriteMode
+ , setGroupIDMode
+ ])
& hasLimits path limit
delete = check (doesDirectoryExist path) $