From c15ceeb3eb37666435499d3d7dcb144fbaa0990d Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Wed, 11 Jan 2012 03:53:31 +0530 Subject: [PATCH] (doc) '-q' option to gl-setup, plus significance of pubkey filename And the quick install instructions should really show the "-q"... --- doc/1000-words.mkd | 2 +- doc/index.mkd | 2 +- doc/install.mkd | 27 ++++++++++++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/doc/1000-words.mkd b/doc/1000-words.mkd index 6eb32d4..9fec921 100644 --- a/doc/1000-words.mkd +++ b/doc/1000-words.mkd @@ -48,7 +48,7 @@ for each step shown: 1. copy the admin's pubkey to the server as "alice.pub" 2. `git clone git://github.com/sitaramc/gitolite` or equivalent 3. `gitolite/src/gl-system-install` -4. `gl-setup alice.pub` +4. `gl-setup -q alice.pub` Note also that you only need ONE real user on the server. In our example it is git. In particular, you do NOT create Unix userids for your gitolite diff --git a/doc/index.mkd b/doc/index.mkd index 7b0b42e..bfc8739 100644 --- a/doc/index.mkd +++ b/doc/index.mkd @@ -14,7 +14,7 @@ sane setup, the following steps should work: git clone git://github.com/sitaramc/gitolite gitolite/src/gl-system-install - gl-setup ~/YourName.pub + gl-setup -q ~/YourName.pub You're done. If it didn't work, well that's what the [install][] doc is for, especially the [if you run into trouble][insttrouble] section. diff --git a/doc/install.mkd b/doc/install.mkd index 9f3f3ef..c4220bd 100644 --- a/doc/install.mkd +++ b/doc/install.mkd @@ -36,7 +36,10 @@ Debian packages create. Your distro/OS may vary.) On your *workstation*: - * copy your `~/.ssh/id_rsa.pub` file to `/tmp/YourName.pub` on the server + * copy your `~/.ssh/id_rsa.pub` file to `/tmp/YourName.pub` on the server. + (The name of this file determines your gitolite username, so if you leave + it as `id_rsa.pub`, your gitolite username will be `id_rsa`, which may not + be what you want). On your *server*, as *root*: @@ -49,6 +52,9 @@ On your *server*, as *root*: # (now as gitolite) gl-setup /tmp/YourName.pub +Note: if you're running non-interactively (i.e., cannot tolerate an editor +popping up), insert a "-q" before the argument to gl-setup. + On your *workstation*: git clone gitolite@server:gitolite-admin @@ -68,7 +74,11 @@ me to link it here). On your *workstation*: - * copy your `~/.ssh/id_rsa.pub` file to `/tmp/YourName.pub` on the server + * copy your `~/.ssh/id_rsa.pub` file to `/tmp/YourName.pub` on the server. + (The name of this file determines your gitolite username, so if you leave + it as `id_rsa.pub`, your gitolite username will be `id_rsa`, which may not + be what you want). + On your *server*, as *git* (the "hosting user"), first check if `$HOME/bin` is on the default PATH. If not, fiddle with the `.bashrc` or `.bash_profile` or @@ -84,6 +94,9 @@ similar files and add it somehow. Then: gl-setup /tmp/YourName.pub +Note: if you're running non-interactively (i.e., cannot tolerate an editor +popping up), insert a "-q" before the argument to gl-setup. + On your *workstation*: git clone git@server:gitolite-admin @@ -122,7 +135,12 @@ There are many, many ways to skin this cat; here's one way: On your *workstation*: - * copy your `~/.ssh/id_rsa.pub` file to `/tmp/YourName.pub` on the server + * copy your `~/.ssh/id_rsa.pub` file to `/tmp/YourName.pub` on the server. + (The name of this file determines your gitolite username, so if you leave + it as `id_rsa.pub`, your gitolite username will be `id_rsa`, which may not + be what you want). + + On your *server*, as *root*: @@ -143,6 +161,9 @@ On your *server*, as *root*: # (now as git) gl-setup /tmp/YourName.pub +Note: if you're running non-interactively (i.e., cannot tolerate an editor +popping up), insert a "-q" before the argument to gl-setup. + On your *workstation*: git clone git@server:gitolite-admin