From 2078a0c828a064d0e12eed9110c3f71237a3d022 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Thu, 29 Nov 2007 00:40:34 +0200 Subject: Write gitweb projects.list to ~/gitosis, not inside the gitosis-admin repo. This allows running gitweb as a separate user without needing to allow it read access to gitosis-admin.git. Running as separate user will still most likely require a ``chgrp www-data`` of the relevant repositories, but nothing not already decided public needs to be exposed. Existing gitweb users will need to adjust their gitweb.conf to point to the new location of the projects.list file. Removing the old projects.list from ~git/repositories/gitosis-admin.git/projects.list is safe once gitweb has switched to using the new location. --- gitosis/serve.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gitosis/serve.py') diff --git a/gitosis/serve.py b/gitosis/serve.py index 0b8f775..0f9cb5c 100644 --- a/gitosis/serve.py +++ b/gitosis/serve.py @@ -117,15 +117,11 @@ def serve( gitweb.set_descriptions( config=cfg, ) - gitosis_repo = os.path.join(topdir, 'gitosis-admin.git') - if os.path.isdir(gitosis_repo): - gitweb.generate_project_list( - config=cfg, - path=os.path.join( - gitosis_repo, - 'projects.list', - ), - ) + generated = util.getGeneratedFilesDir(config=cfg) + gitweb.generate_project_list( + config=cfg, + path=os.path.join(generated, 'projects.list'), + ) gitdaemon.set_export_ok( config=cfg, ) -- cgit v1.2.3