propellor spin

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

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)