minor doc/message updates/clarifications
This commit is contained in:
parent
516c028b81
commit
de2e38c372
|
@ -28,9 +28,8 @@ In this document:
|
||||||
### easy install
|
### easy install
|
||||||
|
|
||||||
There is an easy install script that makes installing very easy for the common
|
There is an easy install script that makes installing very easy for the common
|
||||||
case. **This script is meant to be run on your workstation, not on the
|
case. **This script will setup everything on the server, but you have to run
|
||||||
server!** It will take care of all the server side work, *and* get you
|
it on your workstation, NOT on the server!**
|
||||||
"push-to-admin" too :-) In short, it does **everything**!
|
|
||||||
|
|
||||||
Assumptions/pre-requisites:
|
Assumptions/pre-requisites:
|
||||||
|
|
||||||
|
@ -120,7 +119,7 @@ gitolite.
|
||||||
|
|
||||||
This is where gitolite is eventually installed. You need a *normal* userid
|
This is where gitolite is eventually installed. You need a *normal* userid
|
||||||
(typically "git" but can be anything) on this machine; root access is *not*
|
(typically "git" but can be anything) on this machine; root access is *not*
|
||||||
needed.
|
needed, but it has to be some sort of Unix (not Windows).
|
||||||
|
|
||||||
You need the following software on it:
|
You need the following software on it:
|
||||||
|
|
||||||
|
@ -134,11 +133,6 @@ You need the following software on it:
|
||||||
* openssh server
|
* openssh server
|
||||||
* (I guess any ssh server that can understand the `authorized_keys` file
|
* (I guess any ssh server that can understand the `authorized_keys` file
|
||||||
format should work)
|
format should work)
|
||||||
* **bash shell**
|
|
||||||
* a small part of the gitolite server side is written in "bash"; I
|
|
||||||
intend to test it (time permitting) on non-bash (like ksh or plain sh)
|
|
||||||
on non-Linux servers. Once that is done, this bash dependency will go
|
|
||||||
away.
|
|
||||||
|
|
||||||
#### install workstation
|
#### install workstation
|
||||||
|
|
||||||
|
|
|
@ -137,6 +137,8 @@ Here's how it all hangs together.
|
||||||
the `gl-auth-command` program at all, and so none of gitolite's access
|
the `gl-auth-command` program at all, and so none of gitolite's access
|
||||||
control will work.
|
control will work.
|
||||||
|
|
||||||
|
<a name="altkey"></a>
|
||||||
|
|
||||||
You need to force ssh to use the *other* keypair when performing a git
|
You need to force ssh to use the *other* keypair when performing a git
|
||||||
operation. With normal ssh, that would be
|
operation. With normal ssh, that would be
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@ die "bad command: $cmd. Make sure the repo name is exactly as in your config\n"
|
||||||
# we know the user and repo; we just need to know what perm he's trying
|
# we know the user and repo; we just need to know what perm he's trying
|
||||||
my $perm = ($verb =~ $R_COMMANDS ? 'R' : 'W');
|
my $perm = ($verb =~ $R_COMMANDS ? 'R' : 'W');
|
||||||
|
|
||||||
die "$perm access for $repo denied to $user\n"
|
die "$perm access for $repo DENIED to $user\n"
|
||||||
unless $repos{$repo}{$perm}{$user}
|
unless $repos{$repo}{$perm}{$user}
|
||||||
or $repos{$repo}{$perm}{'@all'};
|
or $repos{$repo}{$perm}{'@all'};
|
||||||
|
|
||||||
|
|
|
@ -119,8 +119,6 @@ Notes:
|
||||||
gitolite admin
|
gitolite admin
|
||||||
|
|
||||||
Pre-requisites:
|
Pre-requisites:
|
||||||
- you must run this from the gitolite working tree top level directory.
|
|
||||||
This means you run this as "src/gl-easy-install"
|
|
||||||
- you must already have pubkey based access to user@host. If you currently
|
- you must already have pubkey based access to user@host. If you currently
|
||||||
only have password access, use "ssh-copy-id" or something equivalent (or
|
only have password access, use "ssh-copy-id" or something equivalent (or
|
||||||
copy the key manually). Somehow (doesn't matter how), get to the point
|
copy the key manually). Somehow (doesn't matter how), get to the point
|
||||||
|
@ -420,14 +418,14 @@ GIT_WORK_TREE=$GL_ADMINDIR git commit -am start --allow-empty
|
||||||
|
|
||||||
# MANUAL: you're done! Log out of the server, come back to your
|
# MANUAL: you're done! Log out of the server, come back to your
|
||||||
# workstation, and clone the admin repo using "git clone
|
# workstation, and clone the admin repo using "git clone
|
||||||
# gitolite:gitolite-admin.git", or pull once again if you already have a
|
# gitolite:gitolite-admin", or pull once again if you already have a
|
||||||
# clone
|
# clone
|
||||||
|
|
||||||
prompt "cloning gitolite-admin repo..." "$v_cloning"
|
prompt "cloning gitolite-admin repo..." "$v_cloning"
|
||||||
|
|
||||||
cleanup
|
cleanup
|
||||||
cd "$HOME"
|
cd "$HOME"
|
||||||
git clone gitolite:gitolite-admin.git
|
git clone gitolite:gitolite-admin
|
||||||
|
|
||||||
# MANUAL: be sure to read the message below; this applies to you too...
|
# MANUAL: be sure to read the message below; this applies to you too...
|
||||||
|
|
||||||
|
@ -577,9 +575,9 @@ keychain or some such software, you may have to run this each time you log in:
|
||||||
|
|
||||||
URLS: *Your* URL for cloning any repo on this server will be
|
URLS: *Your* URL for cloning any repo on this server will be
|
||||||
|
|
||||||
gitolite:reponame.git
|
gitolite:reponame
|
||||||
|
|
||||||
*Other* users you set up will have to use
|
*Other* users you set up will have to use
|
||||||
|
|
||||||
\$user@\$host:reponame.git
|
\$user@\$host:reponame
|
||||||
"
|
"
|
||||||
|
|
Loading…
Reference in a new issue