diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-12 15:40:13 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-12 15:40:22 +0100 |
| commit | 46c07db296c992ac65d73799f308b536674edc93 (patch) | |
| tree | fb77c0b674bc176f5babda014243396cf03abcdb /gitano-admin | |
| parent | 1a6a09f604441cc2322903b9a1cba4f3564c68a2 (diff) | |
| download | trove-setup-46c07db296c992ac65d73799f308b536674edc93.tar.gz | |
Fixes from walkthrough
Diffstat (limited to 'gitano-admin')
| -rw-r--r-- | gitano-admin/global-hooks/post-receive.lua | 2 | ||||
| -rw-r--r-- | gitano-admin/rules/createrepo.lace | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gitano-admin/global-hooks/post-receive.lua b/gitano-admin/global-hooks/post-receive.lua index 679cfa8..d1b3864 100644 --- a/gitano-admin/global-hooks/post-receive.lua +++ b/gitano-admin/global-hooks/post-receive.lua @@ -47,7 +47,7 @@ if notify_mason and repo.name ~= "gitano-admin" then for i = 1, #urlbases do local comma = (i==#urlbases) and "" or "," - _(("%q,"):format(urlbases[i] .. repo.name) + _(("%q,"):format(urlbases[i] .. repo.name)) _(("%q%s"):format(urlbases[i] .. repo.name .. ".git", comma)) end diff --git a/gitano-admin/rules/createrepo.lace b/gitano-admin/rules/createrepo.lace index 045d7e7..27583ae 100644 --- a/gitano-admin/rules/createrepo.lace +++ b/gitano-admin/rules/createrepo.lace @@ -14,7 +14,10 @@ ##PEOPLE_COMMENT##allow "Personal repo creation is okay" repo_is_personal # Allow people in *-admins to create repositories under <foo> -allow "Project admins may make project repositories" repo_has_project_code project_admin +allow "Project admins may make project repositories" repo_is_local_project project_admin + +# Allow lorry to create repositories anywhere but the local project root +allow "Lorry may create repositories anywhere but the local root" !repo_is_local_project is_lorry # Otherwise the default is that non-admins can't create repositories deny "Repository creation is not permitted." |