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

propellor spin

This commit is contained in:
Joey Hess 2014-04-13 14:12:11 -04:00
parent 4dac4eea22
commit 2e128c8fe2
Failed to extract signature
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Propellor/Property/Git.hs
View File

@ -75,8 +75,10 @@ cloned owner url dir mbranch = check originurl (Property desc checkout)
, return True , return True
) )
checkout = do checkout = do
liftIO $ whenM (doesDirectoryExist dir) $ liftIO $ do
removeDirectoryRecursive dir whenM (doesDirectoryExist dir) $
removeDirectoryRecursive dir
createDirectoryIfMissing True (takeDirectory dir)
ensureProperty $ userScriptProperty owner $ catMaybes ensureProperty $ userScriptProperty owner $ catMaybes
[ Just $ "git clone " ++ shellEscape url ++ " " ++ shellEscape dir [ Just $ "git clone " ++ shellEscape url ++ " " ++ shellEscape dir
, Just $ "cd " ++ shellEscape dir , Just $ "cd " ++ shellEscape dir

3
Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -53,11 +53,12 @@ gitServer hosts = propertyList "git.kitenet.net setup"
, "$feature{'snapshot'}{'default'} = [];" , "$feature{'snapshot'}{'default'} = [];"
] ]
`describe` "gitweb configured" `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.kitenet.net"
, website "git.joeyh.name" , website "git.joeyh.name"
-- ssh keys for branchable and github repo hooks -- ssh keys for branchable and github repo hooks
-- TODO: upgrade to newer git-annex-shell for notification -- TODO: upgrade to newer git-annex-shell for notification
-- gitweb
] ]
where where
website hn = toProp $ Apache.siteEnabled hn (gitapacheconf hn) website hn = toProp $ Apache.siteEnabled hn (gitapacheconf hn)