From 6787dc2c84b6044588d50cb2743575b462cb1af0 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Tue, 27 Apr 2010 10:21:40 +0530 Subject: [PATCH] (minor) fix docs about admin-ing a gitolite installation (since easy-install is no longer the *only* install method) --- doc/0-INSTALL.mkd | 16 +++++++++++----- doc/2-admin.mkd | 10 +++++++++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/0-INSTALL.mkd b/doc/0-INSTALL.mkd index 5267f69..b1ae760 100644 --- a/doc/0-INSTALL.mkd +++ b/doc/0-INSTALL.mkd @@ -6,7 +6,7 @@ Gitolite is somewhat unusual as far as "server" software goes -- every userid on the server is a potential "gitolite host". This document tells you how to install gitolite. After the install is done, -you may want to see the [admin document][admin] for adding users, repos, etc. +you may want to see [doc/2-admin.mkd][admin] for adding users, repos, etc. **Please note** that gitolite depends heavily on proper ssh setup and pubkey based access. Sadly, most people don't know ssh as well as they think they @@ -54,7 +54,9 @@ The "user install" section describes this method. The **system-install followed by user-setup** mode is used when you (or someone who has root) has installed an RPM or DEB of gitolite and you intend -to use that version. +to use that version. [Update 2010-04-27: there is now a script called +`gl-system-install` that helps you do a system-install if your distribution +does not yet have a package for gitolite; details below]. The "system install / user setup" section describes this method. @@ -202,11 +204,15 @@ to have a command line on the server, so don't give them the passwords if you don't need to -- the pubkey will allow them to be gitolite admins on their domain, and that's quite enough for normal operations. +---- + ### next steps -The last message produced by the easy install script should tell you how to -add users, repos, etc., and you will find more details in the [admin][admin] -document. +If you installed it using "gl-easy-install", the last message produced by that +script should tell you how to add users, repos, etc. In any case, you will +find more details in [doc/2-admin.mkd][admin]. + +---- diff --git a/doc/2-admin.mkd b/doc/2-admin.mkd index 4b27d59..8eeaf2a 100644 --- a/doc/2-admin.mkd +++ b/doc/2-admin.mkd @@ -19,7 +19,15 @@ First of all, ***do NOT add new repos manually***, unless you know how to add the required hook as well. Without the hook, branch-level access control will not work for that repo, which sorta defeats the idea of using gitolite :-) -Please read on to see how to do this correctly. +Most normal (day-to-day) gitolite admin work is done by cloning the +gitolite-admin repo from the server to your workstation, making changes to the +clone, and pushing those changes back. + +If you installed using "gl-easy-install", that script would have already tried +to clone the repo to your `$HOME`. Otherwise clone it yourself to any +convenient location you like. + +Once you've cloned it, you're ready to add users and repos. #### adding users and repos