cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix dir owner

This commit is contained in:
Joey Hess 2014-05-21 14:57:04 -04:00
parent 38bba6c8ed
commit 07d3d359d2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Propellor/Property/Ssh.hs
View File

@ -107,12 +107,13 @@ keyImported keytype user = combineProperties desc
f <- liftIO $ keyfile ext f <- liftIO $ keyfile ext
ifM (liftIO $ doesFileExist f) ifM (liftIO $ doesFileExist f)
( noChange ( noChange
, ensureProperty $ combineProperties desc , ensureProperties
[ property desc $ [ property desc $
withPrivData p $ \key -> makeChange $ do withPrivData p $ \key -> makeChange $ do
createDirectoryIfMissing True (takeDirectory f) createDirectoryIfMissing True (takeDirectory f)
writer f key writer f key
, File.ownerGroup f user user , File.ownerGroup f user user
, File.ownerGroup (takeDirectory f) user user
] ]
) )
keyfile ext = do keyfile ext = do
@ -150,4 +151,7 @@ authorizedKeys user = property (user ++ " has authorized_keys") $
liftIO $ do liftIO $ do
createDirectoryIfMissing True (takeDirectory f) createDirectoryIfMissing True (takeDirectory f)
writeFileProtected f v writeFileProtected f v
ensureProperty $ File.ownerGroup f user user ensureProperties
[ File.ownerGroup f user user
, File.ownerGroup (takeDirectory f) user user
]