From 2e128c8fe25fb92ecfbd0bbe79ea777d53fa11ca Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Apr 2014 14:12:11 -0400 Subject: propellor spin --- Propellor/Property/Git.hs | 6 ++++-- Propellor/Property/SiteSpecific/JoeySites.hs | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'Propellor/Property') diff --git a/Propellor/Property/Git.hs b/Propellor/Property/Git.hs index 6541dc74..431f4134 100644 --- a/Propellor/Property/Git.hs +++ b/Propellor/Property/Git.hs @@ -75,8 +75,10 @@ cloned owner url dir mbranch = check originurl (Property desc checkout) , return True ) checkout = do - liftIO $ whenM (doesDirectoryExist dir) $ - removeDirectoryRecursive dir + liftIO $ do + whenM (doesDirectoryExist dir) $ + removeDirectoryRecursive dir + createDirectoryIfMissing True (takeDirectory dir) ensureProperty $ userScriptProperty owner $ catMaybes [ Just $ "git clone " ++ shellEscape url ++ " " ++ shellEscape dir , Just $ "cd " ++ shellEscape dir diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs index 81557b32..fa444160 100644 --- a/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/Propellor/Property/SiteSpecific/JoeySites.hs @@ -53,11 +53,12 @@ gitServer hosts = propertyList "git.kitenet.net setup" , "$feature{'snapshot'}{'default'} = [];" ] `describe` "gitweb configured" + -- I keep the website used for gitweb checked into git.. + , Git.cloned "joey" "/srv/git/joey/git.kitenet.net.git" "/srv/web/git.kitenet.net" Nothing , website "git.kitenet.net" , website "git.joeyh.name" -- ssh keys for branchable and github repo hooks -- TODO: upgrade to newer git-annex-shell for notification - -- gitweb ] where website hn = toProp $ Apache.siteEnabled hn (gitapacheconf hn) -- cgit v1.2.3