From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PpO0y-0004kN-7b for garchives@archives.gentoo.org; Tue, 15 Feb 2011 16:44:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CF9FE0A61; Tue, 15 Feb 2011 16:42:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4A86AE0931 for ; Tue, 15 Feb 2011 16:42:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DBC171B4249 for ; Tue, 15 Feb 2011 16:42:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 45A2F8005E for ; Tue, 15 Feb 2011 16:42:13 +0000 (UTC) From: "Christian Ruppert" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Ruppert" Message-ID: Subject: [gentoo-commits] proj/gitolite-gentoo:upstream commit in: doc/, conf/ X-VCS-Repository: proj/gitolite-gentoo X-VCS-Files: conf/example.gitolite.rc doc/delegation.mkd doc/install-transcript.mkd doc/progit-article.mkd doc/ssh-troubleshooting.mkd X-VCS-Directories: doc/ conf/ X-VCS-Committer: idl0r X-VCS-Committer-Name: Christian Ruppert X-VCS-Revision: e0f4bbaf16bee86108e457d72b37f43abe04ffb1 Date: Tue, 15 Feb 2011 16:42:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6ca1b6a8c2ddc9a75f668717064a7e96 commit: e0f4bbaf16bee86108e457d72b37f43abe04ffb1 Author: Sitaram Chamarty atc tcs com> AuthorDate: Fri Dec 31 14:21:06 2010 +0000 Commit: Christian Ruppert gentoo org> CommitDate: Fri Dec 31 14:47:36 2010 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gitolite-gent= oo.git;a=3Dcommit;h=3De0f4bbaf (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 =20 # PLEASE READ THE DOCUMENTATION BEFORE EDITING OR ASKING QUESTIONS +# ( http://github.com/sitaramc/gitolite/blob/pu/doc/gitolite.rc.mkd ) =20 # this file is meant to be pulled into a perl program using "do" or "req= uire". # 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 ;-) =20 [abe]: http://en.wikipedia.org/wiki/Alice_and_Bob#List_of_characters =20 -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: =20 # 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`). | .. | +-----------------+ =20 - 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 =20 You start by obtaining public key based access to your server, so that y= ou can log in from your workstation to the server without getting a passw= ord prompt. The following method works on Linux; for other workstation O= Ss you may have to do this manually. We assume you already had a key pai= r generated using `ssh-keygen`. =20 - $ ssh-copy-id -i ~/.ssh/id_rsa gitolite@gitserver + $ ssh-copy-id -i ~/.ssh/id_rsa.pub gitolite@gitserver =20 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 promp= t: =20 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 n= eeded. 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 passwordles= s + * run `ssh-copy-id -i ~/.ssh/id_rsa.pub git@server` to get passwor= dless access to the server. (Mac users may have to do this step manua= lly) * make sure `ssh git@server pwd` prints the `$HOME` of `git@server= ` **without** asking for a password. Do not proceed till this wor= ks.