GITANO: Update to remove repository_root from gitano-admin

5 files changed, 7 insertions, 4 deletions

diff --git a/bin/gitano-auth.in b/bin/gitano-auth.in
index d21e85b..37c4fe1 100644
--- a/bin/gitano-auth.in
+++ b/bin/gitano-auth.in
@@ -20,6 +20,8 @@ local sp = require "luxio.subprocess"
 
 local repo_root, username, keytag = ...
 
+gitano.config.repo_path(repo_root)
+
 local cmdline = luxio.getenv "SSH_ORIGINAL_COMMAND" or ""
 
 if cmdline:match("^[ \t\n]*$") then
diff --git a/bin/gitano-post-receive-hook.in b/bin/gitano-post-receive-hook.in
index 45a1b7e..96d5fb2 100644
--- a/bin/gitano-post-receive-hook.in
+++ b/bin/gitano-post-receive-hook.in
@@ -30,7 +30,7 @@ local project   = luxio.getenv("GITANO_PROJECT") or ""
 local source    = luxio.getenv("GITANO_SOURCE") or "ssh"
 
 -- Now load the administration data
-
+gitano.config.repo_path(repo_root)
 local admin_repo = gitano.git.repository.new((repo_root or "") .. "/gitano-admin.git")
 
 if not admin_repo then
@@ -112,7 +112,7 @@ if repo.name == "gitano-admin" and updates[admin_repo.HEAD] then
    gitano.log.chat("All repositories updated where possible.")
    local proc = sp.spawn({
 			    gitano.config.lib_bin_path() .. "/gitano-update-ssh",
-			    config.global.repository_root
+			    gitano.config.repo_path()
 			 })
    local how, why = proc:wait()
    if how ~= "exit" or why ~= 0 then
diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index 7408f44..6ca13a1 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -167,7 +167,6 @@ gitano.log.info("=> Prepare site config")
 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["log.prefix"] = get "log.prefix"
 completely_flat["site.conf"] = site_conf:serialise()
 
@@ -219,6 +218,7 @@ gitano.log.info("=> Make paths")
 gitano.util.mkdir_p(get("paths.repos") .. "/.graveyard")
 gitano.util.mkdir_p(get "paths.ssh")
 assert(sio.chmod(get "paths.ssh", "0700"))
+gitano.config.repo_path(get "paths.repos")
 
 gitano.log.info("=> Prepare repository")
 
diff --git a/bin/gitano-update-hook.in b/bin/gitano-update-hook.in
index 0e8af59..980ebc2 100644
--- a/bin/gitano-update-hook.in
+++ b/bin/gitano-update-hook.in
@@ -34,7 +34,7 @@ local project   = luxio.getenv("GITANO_PROJECT") or ""
 local source    = luxio.getenv("GITANO_SOURCE") or "ssh"
 
 -- Now load the administration data
-
+gitano.config.repo_path(repo_root)
 local admin_repo = gitano.git.repository.new((repo_root or "") .. "/gitano-admin.git")
 
 if not admin_repo then
diff --git a/bin/gitano-update-ssh.in b/bin/gitano-update-ssh.in
index 4794074..1000d91 100644
--- a/bin/gitano-update-ssh.in
+++ b/bin/gitano-update-ssh.in
@@ -20,6 +20,7 @@ local sp = require "luxio.subprocess"
 
 local repo_root = ...
 
+gitano.config.repo_path(repo_root)
 gitano.log.bump_level(gitano.log.level.CHAT)
 
 -- Now load the administration data