GITANO: Remove need for graveyard_root

1 files changed, 2 insertions, 17 deletions

diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index 211f669..7408f44 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -146,8 +146,6 @@ assert(file_exists(ask_for("paths.pubkey", "Public key file for admin user",
 
 ask_for("paths.repos", "Repository path for new Gitano instance",
 	get("paths.home") .. "/repos")
-ask_for("paths.graveyard", "Graveyard path for new Gitano instance",
-	get("paths.home") .. "/graveyard")
 
 validate_name(ask_for("admin.username", "User name for admin user",
 		      os.getenv "USER" or "admin"))
@@ -170,7 +168,6 @@ local completely_flat = {}
 local site_conf = clod.parse("")
 site_conf.settings["site_name"] = get "site.name"
 site_conf.settings["repository_root"] = get "paths.repos"
-site_conf.settings["graveyard_root"] = get "paths.graveyard"
 site_conf.settings["log.prefix"] = get "log.prefix"
 completely_flat["site.conf"] = site_conf:serialise()
 
@@ -218,21 +215,9 @@ completely_flat["groups/gitano-admin.conf"] = groupconf:serialise()
 
 gitano.log.chat("Step 3: Write out paths and gitano-admin.git")
 
-function mkdir_p(path)
-   if look_for_path(path) then
-      return
-   end
-   local parent = path:match("^(.+)/.*")
-   if not look_for_path(parent) then
-      mkdir_p(parent)
-   end
-   assert(sio.mkdir(path))
-end
-
 gitano.log.info("=> Make paths")
-mkdir_p(get "paths.repos")
-mkdir_p(get "paths.graveyard")
-mkdir_p(get "paths.ssh")
+gitano.util.mkdir_p(get("paths.repos") .. "/.graveyard")
+gitano.util.mkdir_p(get "paths.ssh")
 assert(sio.chmod(get "paths.ssh", "0700"))
 
 gitano.log.info("=> Prepare repository")