X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/blobdiff_plain/3e4e36646abc246c52b6001b2a04ab70c31060b5..7826e4072b7421fcef68be846e5feec6649aa72f:/invirt-build-conf diff --git a/invirt-build-conf b/invirt-build-conf index 1acbc9d..8df29d2 100755 --- a/invirt-build-conf +++ b/invirt-build-conf @@ -43,7 +43,7 @@ def main(): build_handler = '/usr/bin/invirt-submit-build' for pocket in config.build.pockets: - acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl, None) + acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl) with atomic_write(acl_path(pocket)) as f: princs = [userToPrinc(a) for a in acl] print >>f, '\n'.join(princs) @@ -54,13 +54,17 @@ def main(): print >>f, 'build %s %s %s' % (pocket, build_handler, acl_path(pocket)) with atomic_write('/etc/remctl/acl/repo_admin') as f: - acl = authz.expandAdmin(config.build.repo_admin, None) + acl = authz.expandAdmin(config.build.repo_admin) print >>f, '\n'.join(userToPrinc(a) for a in acl) with atomic_write('/etc/remctl/conf.d/repo_admin') as f: print >>f, 'create repo /usr/bin/invirt-add-repo /etc/remctl/acl/repo_admin' with atomic_write(os.path.join(builder._REPO_DIR, '.k5login')) as f: + if 'repo_access' in config.build: + acl = authz.expandAdmin(config.build.repo_access) + princs = [userToPrinc(a) for a in acl] + all_devs.update(set(princs)) print >>f, '\n'.join(all_devs)