From e0f4bbaf16bee86108e457d72b37f43abe04ffb1 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Fri, 31 Dec 2010 19:51:06 +0530 Subject: [PATCH] (minor) more doc updates, really small ones --- conf/example.gitolite.rc | 1 + doc/delegation.mkd | 2 +- doc/install-transcript.mkd | 2 +- doc/progit-article.mkd | 2 +- doc/ssh-troubleshooting.mkd | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/example.gitolite.rc b/conf/example.gitolite.rc index 8f8653a..8626be1 100644 --- a/conf/example.gitolite.rc +++ b/conf/example.gitolite.rc @@ -1,6 +1,7 @@ # configuration variables for gitolite # PLEASE READ THE DOCUMENTATION BEFORE EDITING OR ASKING QUESTIONS +# ( http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd ) # this file is meant to be pulled into a perl program using "do" or "require". # You do NOT need to know perl to edit the paths; it should be fairly diff --git a/doc/delegation.mkd b/doc/delegation.mkd index 9fe4293..b450403 100644 --- a/doc/delegation.mkd +++ b/doc/delegation.mkd @@ -71,7 +71,7 @@ in charge of malware ;-) [abe]: http://en.wikipedia.org/wiki/Alice_and_Bob#List_of_characters -You do this by adding branches to the `gitolite-admin` repo: +You do this by adding files with specific names to the `gitolite-admin` repo: # the admin repo access was probably like this to start with: repo gitolite-admin diff --git a/doc/install-transcript.mkd b/doc/install-transcript.mkd index 1a3bcbc..178ba1a 100644 --- a/doc/install-transcript.mkd +++ b/doc/install-transcript.mkd @@ -127,7 +127,7 @@ described in the `ssh-copy-id` section in `doc/3-faq-tips-etc.mkd`). | .. | +-----------------+ - sita@sita-lt:~ $ ssh-copy-id -i ~/.ssh/id_rsa git@server + sita@sita-lt:~ $ ssh-copy-id -i ~/.ssh/id_rsa.pub git@server git@server's password: /usr/bin/xauth: creating new authority file /home/git/.Xauthority Now try logging into the machine, with "ssh 'git@server'", and check in: diff --git a/doc/progit-article.mkd b/doc/progit-article.mkd index da016d3..2667c9b 100644 --- a/doc/progit-article.mkd +++ b/doc/progit-article.mkd @@ -24,7 +24,7 @@ We will describe this last method in this article; for the other methods please You start by obtaining public key based access to your server, so that you can log in from your workstation to the server without getting a password prompt. The following method works on Linux; for other workstation OSs you may have to do this manually. We assume you already had a key pair generated using `ssh-keygen`. - $ ssh-copy-id -i ~/.ssh/id_rsa gitolite@gitserver + $ ssh-copy-id -i ~/.ssh/id_rsa.pub gitolite@gitserver This will ask you for the password to the gitolite account, and then set up public key access. This is **essential** for the install script, so check to make sure you can run a command without getting a password prompt: diff --git a/doc/ssh-troubleshooting.mkd b/doc/ssh-troubleshooting.mkd index 6238cf9..0fa7169 100644 --- a/doc/ssh-troubleshooting.mkd +++ b/doc/ssh-troubleshooting.mkd @@ -307,7 +307,7 @@ from scratch: `sitaram`, along with corresponding `.pub` files). Create them if needed. Also make sure they are *different* and not a copy of each other :-) * install gitolite normally: - * run `ssh-copy-id -i ~/.ssh/id_rsa git@server` to get passwordless + * run `ssh-copy-id -i ~/.ssh/id_rsa.pub git@server` to get passwordless access to the server. (Mac users may have to do this step manually) * make sure `ssh git@server pwd` prints the `$HOME` of `git@server` **without** asking for a password. Do not proceed till this works.