summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Ssh.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-21 14:57:04 -0400
committerJoey Hess2014-05-21 14:57:04 -0400
commit07d3d359d27089739ff30cbcefd038986ecef641 (patch)
treefee15e89a6bf3ae8eea417802db15ccd9b82a0dd /src/Propellor/Property/Ssh.hs
parent38bba6c8ed2d0855c1a44e123a6721a9a287e208 (diff)
fix dir owner
Diffstat (limited to 'src/Propellor/Property/Ssh.hs')
-rw-r--r--src/Propellor/Property/Ssh.hs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs
index 516525ad..061f440c 100644
--- a/src/Propellor/Property/Ssh.hs
+++ b/src/Propellor/Property/Ssh.hs
@@ -107,12 +107,13 @@ keyImported keytype user = combineProperties desc
f <- liftIO $ keyfile ext
ifM (liftIO $ doesFileExist f)
( noChange
- , ensureProperty $ combineProperties desc
+ , ensureProperties
[ property desc $
withPrivData p $ \key -> makeChange $ do
createDirectoryIfMissing True (takeDirectory f)
writer f key
, File.ownerGroup f user user
+ , File.ownerGroup (takeDirectory f) user user
]
)
keyfile ext = do
@@ -150,4 +151,7 @@ authorizedKeys user = property (user ++ " has authorized_keys") $
liftIO $ do
createDirectoryIfMissing True (takeDirectory f)
writeFileProtected f v
- ensureProperty $ File.ownerGroup f user user
+ ensureProperties
+ [ File.ownerGroup f user user
+ , File.ownerGroup (takeDirectory f) user user
+ ]