From 3b91f5bba315ebbb252dfd71528009c32aa54644 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 May 2014 14:13:39 -0400 Subject: propellor spin --- src/Propellor/Property/Ssh.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Property/Ssh.hs') diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index a4f87678..516525ad 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -109,7 +109,8 @@ keyImported keytype user = combineProperties desc ( noChange , ensureProperty $ combineProperties desc [ property desc $ - withPrivData p $ \key -> makeChange $ + withPrivData p $ \key -> makeChange $ do + createDirectoryIfMissing True (takeDirectory f) writer f key , File.ownerGroup f user user ] -- cgit v1.3-2-g0d8e From 07d3d359d27089739ff30cbcefd038986ecef641 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 May 2014 14:57:04 -0400 Subject: fix dir owner --- src/Propellor/Property/Ssh.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/Ssh.hs') 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 + ] -- cgit v1.3-2-g0d8e