2009-11-03 09:31:03 +01:00
|
|
|
# ssh troubleshooting
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-12-23 15:26:53 +01:00
|
|
|
Update 2009-12-23: most of this document is now of historical interest and
|
|
|
|
will be totally revamped when I have time. For now, just note this amendment.
|
|
|
|
|
|
|
|
The document below says "we can't use the same key for both [gitolite access
|
|
|
|
and shell access]...". We've managed (thanks to an idea from Jesse Keating)
|
|
|
|
to get around this. Now it *is* possible for a single key to allow both
|
|
|
|
gitolite access *and* shell access.
|
|
|
|
|
|
|
|
This is done by placing such a user in a special `@SHELL` group in the
|
|
|
|
gitolite config file. As usual, please see `conf/example.conf` for more info
|
|
|
|
on this, since I'm using that as a central place to document anything
|
|
|
|
concerned with the conf file.
|
|
|
|
|
|
|
|
----
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
Ssh has always been the biggest troublespot in all this. While gitolite makes
|
|
|
|
it as easy as possible, you might still run into trouble sometimes.
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
In this document:
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
* ssh sanity checks
|
|
|
|
* explanation
|
|
|
|
* files on the server
|
|
|
|
* files on client
|
2009-11-12 02:47:37 +01:00
|
|
|
* why two keys on client
|
2009-11-03 09:31:03 +01:00
|
|
|
* more complex ssh setups
|
|
|
|
* two gitolite servers to manage?
|
|
|
|
* further reading
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-10-30 13:12:26 +01:00
|
|
|
----
|
|
|
|
|
|
|
|
> But before we get to all that, let's clarify that all this is applicable
|
|
|
|
> **only** to the gitolite **admin**. He's the only one who needs both a
|
|
|
|
> shell and gitolite access, so he has **two** pubkeys in play.
|
|
|
|
|
|
|
|
> Normal users have only one pubkey, since they are only allowed to access
|
2009-11-03 09:31:03 +01:00
|
|
|
> gitolite itself. They do not need to worry about any of this stuff, and
|
|
|
|
> their repo urls are very simple, like: `git@my.git.server:reponame.git`.
|
2009-10-30 13:12:26 +01:00
|
|
|
|
|
|
|
----
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
### ssh sanity checks
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
There are two quick sanity checks you can run:
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
* running `ssh gitolite` should get you a list of repos you have rights to
|
|
|
|
access, as described [here][myrights]
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
[myrights]: http://github.com/sitaramc/gitolite/blob/pu/doc/3-faq-tips-etc.mkd#myrights
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
* conversely, `ssh git@server` should get you a command line
|
|
|
|
|
|
|
|
If one or both of these does not work as expected, do this:
|
|
|
|
|
|
|
|
* first, check that your `~/.ssh` has two public keys, like below:
|
|
|
|
|
|
|
|
$ ls -al ~/.ssh/*.pub
|
|
|
|
-rw-r--r-- 1 sitaram sitaram 409 2008-04-21 17:42 /home/sitaram/.ssh/id_rsa.pub
|
|
|
|
-rw-r--r-- 1 sitaram sitaram 409 2009-10-15 16:25 /home/sitaram/.ssh/sitaram.pub
|
|
|
|
|
|
|
|
If it doesn't you have either lost your keys or you're on the wrong
|
|
|
|
machine. As long as you have password access to the server you can alweys
|
|
|
|
recover; just pretend you're installing from scratch and start over.
|
|
|
|
|
|
|
|
* next, try running `ssh-add -l`. On my desktop the output looks like this:
|
|
|
|
|
|
|
|
2048 63:ea:ab:10:d2:4f:88:f4:85:cb:d3:7d:3a:83:37:9a /home/sitaram/.ssh/id_rsa (RSA)
|
|
|
|
2048 d7:23:89:12:5f:22:4f:ad:54:7d:7e:f8:f5:2a:e9:13 /home/sitaram/.ssh/sitaram (RSA)
|
|
|
|
|
|
|
|
If you get only one line (typically the top one), you should ssh-add the
|
|
|
|
other one, using (in my case) `ssh-add ~/.ssh/sitaram`.
|
|
|
|
|
|
|
|
If you get no output, add both of them and check `ssh-add -l` again.
|
|
|
|
|
|
|
|
If this error keeps happening please consider installing [keychain][kch]
|
|
|
|
or something similar, or add these commands to your bash startup scripts.
|
|
|
|
|
|
|
|
[kch]: http://www.gentoo.org/proj/en/keychain/
|
|
|
|
|
|
|
|
* Finally, make sure your `~/.ssh/config` has the required `host gitolite`
|
|
|
|
para (see below for more on this).
|
|
|
|
|
|
|
|
Once these sanity checks have passed, things should be fine. However, if you
|
|
|
|
still have problems, make sure that the "origin" URL in any clones looks like
|
|
|
|
`gitolite:reponame.git`, not `git@server:reponame.git`.
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
### explanation
|
|
|
|
|
|
|
|
Here's how it all hangs together.
|
|
|
|
|
|
|
|
#### files on the server
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
* the authkeys file; this contains one line containing the pubkey of each
|
|
|
|
user who is permitted to login without a password.
|
|
|
|
|
|
|
|
Pubkey lines that give shell access look like this:
|
|
|
|
|
|
|
|
ssh-rsa AAAAB3NzaC[snip]uPjrUiAUew== /home/sitaram/.ssh/id_rsa
|
|
|
|
|
|
|
|
On a typical server there will be only one or two of these lines.
|
|
|
|
|
|
|
|
Note that the last bit (`/home/sitaram/.ssh/id_rsa`) is purely a *comment*
|
|
|
|
field and can be anything. Also, the actual lines are much longer, about
|
|
|
|
400 characters; I snipped 'em in the middle, as you can see.
|
|
|
|
|
|
|
|
In contrast, pubkey lines that give access to git repos hosted by gitolite
|
2009-11-26 07:43:42 +01:00
|
|
|
look like this:
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
command="[some path]src/gl-auth-command sitaram",[some restrictions] ssh-rsa AAAAB3NzaC[snip]s18OnB42oQ== sitaram@sita-lt
|
|
|
|
|
|
|
|
You will have many more of these lines -- one for every pubkey file in
|
|
|
|
`keydir/` of your gitolite-admin repo, with the corresponding username in
|
|
|
|
place of "sitaram" in the example above.
|
|
|
|
|
|
|
|
The "command=" at the beginning ensures that when someone with the
|
|
|
|
corresponding private key logs in, they don't get a shell. Instead, the
|
|
|
|
`gl-auth-command` program is run, and (in this example) is given the
|
|
|
|
argument `sitaram`. This is how gitolite is invoked, (and is told the
|
|
|
|
user logging in is "sitaram").
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
#### files on client
|
|
|
|
|
|
|
|
* default keypair; used to get shell access to servers. You would have
|
|
|
|
copied this pubkey to the gitolite server in order to log in without a
|
|
|
|
password. (On Linux systems you may have used `ssh-copy-id` to do that).
|
|
|
|
You would have done this *before* you ran the easy install script, because
|
|
|
|
otherwise easy install won't run!
|
|
|
|
|
|
|
|
~/.ssh/id_rsa
|
|
|
|
~/.ssh/id_rsa.pub
|
|
|
|
|
|
|
|
* gitolite keypair; the "sitaram" in this is the 3rd argument to the
|
2009-11-13 00:33:09 +01:00
|
|
|
`src/gl-easy-install` command you ran; the easy install script does the
|
2009-11-03 09:31:03 +01:00
|
|
|
rest
|
|
|
|
|
|
|
|
~/.ssh/sitaram
|
|
|
|
~/.ssh/sitaram.pub
|
|
|
|
|
2009-10-25 17:02:32 +01:00
|
|
|
* config file; this file has an entry for gitolite access:
|
|
|
|
|
|
|
|
~/.ssh/config
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
To understand why we need that, let's step back a bit. Normally, you
|
|
|
|
might expect to access gitolite repos like this:
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
ssh://git@server/reponame.git
|
|
|
|
|
|
|
|
But this won't work, because this ends up using the *default* keypair
|
|
|
|
(normally), which gives you a command line. Which means it won't invoke
|
|
|
|
the `gl-auth-command` program at all, and so none of gitolite's access
|
|
|
|
control will work.
|
|
|
|
|
2009-11-22 05:51:22 +01:00
|
|
|
<a name="altkey"></a>
|
|
|
|
|
2009-10-25 17:02:32 +01:00
|
|
|
You need to force ssh to use the *other* keypair when performing a git
|
2009-11-03 09:31:03 +01:00
|
|
|
operation. With normal ssh, that would be
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
ssh -i ~/.ssh/sitaram git@server
|
|
|
|
|
|
|
|
but git does not support putting an alternate keypair in the URL.
|
|
|
|
|
2009-11-26 07:43:42 +01:00
|
|
|
Luckily, ssh has a very convenient way of capturing all the connection
|
2009-10-25 17:02:32 +01:00
|
|
|
information (username, hostname, port number (if it's not the default 22),
|
2009-12-21 01:53:25 +01:00
|
|
|
and keypair to be used) in one "paragraph" of `~/.ssh/config`. This is
|
|
|
|
what the para looks like for us (the easy install script puts it there the
|
|
|
|
first time):
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
host gitolite
|
|
|
|
user git
|
|
|
|
hostname server
|
|
|
|
identityfile ~/.ssh/sitaram
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
(The "gitolite" can be anything you want of course; it's like a group name
|
|
|
|
for all the stuff below it). This ensures that typing
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
ssh gitolite
|
|
|
|
|
|
|
|
is equivalent to
|
|
|
|
|
|
|
|
ssh -i ~/.ssh/sitaram git@server
|
|
|
|
|
|
|
|
and therefore this:
|
|
|
|
|
|
|
|
git clone gitolite:reponame.git
|
|
|
|
|
|
|
|
now works as expected, invoking the special keypair instead of the default
|
|
|
|
one.
|
|
|
|
|
2009-11-12 02:47:37 +01:00
|
|
|
<a name="twokeys"></a>
|
|
|
|
|
|
|
|
#### why two keys on client
|
|
|
|
|
|
|
|
Why do I (the admin) need two **different** keypairs?
|
|
|
|
|
|
|
|
There are two types of access the admin will make to the server: a normal
|
|
|
|
login, to get a shell prompt, and gitolite access (clone/fetch/push etc). The
|
|
|
|
first access needs an authkeys line *without* any "command=" restrictions,
|
|
|
|
while the second requires a line *with* such a restriction.
|
|
|
|
|
|
|
|
And we can't use the same key for both because there is no way to disambiguate
|
|
|
|
them; the ssh server will always (*always*) pick the first one in sequence
|
|
|
|
when the key is offered by the ssh client.
|
|
|
|
|
|
|
|
So the next question is usually "I have other ways to get a shell on that
|
|
|
|
account, so why do I need a key for shell access at all?"
|
|
|
|
|
|
|
|
The answer to this is that the "easy install" script, being written for the
|
|
|
|
most general case, needs shell access via ssh to do its stuff.
|
|
|
|
|
|
|
|
If you really, really, want to get rid of the extra key, here's a transcript
|
|
|
|
that should have enough info to get you going (but it helps to know ssh well):
|
|
|
|
|
|
|
|
* on "sitaram" user, on my workstation
|
|
|
|
|
|
|
|
cd ~/.ssh
|
|
|
|
cp id_rsa sitaram
|
|
|
|
cp id_rsa.pub sitaram.pub
|
|
|
|
cd ~/gitolite-clone
|
2009-11-13 00:33:09 +01:00
|
|
|
src/gl-easy-install -q git my.git.server sitaram
|
2009-11-12 02:47:37 +01:00
|
|
|
|
|
|
|
that last command produces something like the following:
|
|
|
|
|
|
|
|
you are upgrading from (unknown) to v0.80-6-gdde8c4e
|
|
|
|
setting up keypair...
|
|
|
|
...reusing /home/sitaram/.ssh/sitaram.pub...
|
|
|
|
creating gitolite para in ~/.ssh/config...
|
|
|
|
finding/creating gitolite rc...
|
|
|
|
installing/upgrading...
|
|
|
|
Pseudo-terminal will not be allocated because stdin is not a terminal.
|
|
|
|
[master (root-commit) e717a89] start
|
|
|
|
2 files changed, 11 insertions(+), 0 deletions(-)
|
|
|
|
create mode 100644 conf/gitolite.conf
|
|
|
|
create mode 100644 keydir/sitaram.pub
|
|
|
|
cloning gitolite-admin repo...
|
|
|
|
Initialized empty Git repository in /home/sitaram/gitolite-admin/.git/
|
|
|
|
fatal: 'gitolite-admin.git' does not appear to be a git repository
|
|
|
|
fatal: The remote end hung up unexpectedly
|
|
|
|
|
|
|
|
notice that the final step (the clone of the newly created gitolite-admin
|
|
|
|
repo) failed, as expected
|
|
|
|
|
|
|
|
* now log on to the git hosting account (`git@my.git.server` in this
|
|
|
|
example), edit `~/.ssh/authorized_keys`, and delete the line with the
|
|
|
|
first occurrence of your key (this should be *before* the `# gitolite
|
|
|
|
start` line)
|
|
|
|
|
|
|
|
* now go back to your workstation and
|
|
|
|
|
|
|
|
git clone git@my.git.server:gitolite-admin
|
|
|
|
|
|
|
|
That should do it.
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
### more complex ssh setups
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
What do you need to know in order to create more complex ssh setups (for
|
|
|
|
instance if you have *two* gitolite servers you are administering)?
|
2009-10-25 17:02:32 +01:00
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
#### two gitolite servers to manage?
|
2009-10-25 17:02:32 +01:00
|
|
|
|
|
|
|
* they can have the same key; no harm there (example, sitaram.pub)
|
|
|
|
|
|
|
|
* instead of just one ssh/config para, you now have two (assuming that the
|
|
|
|
remote user on both machines is called "git"):
|
|
|
|
|
|
|
|
host gitolite
|
|
|
|
user git
|
|
|
|
hostname server
|
|
|
|
identityfile ~/.ssh/sitaram
|
|
|
|
|
|
|
|
host gitolite2
|
|
|
|
user git
|
|
|
|
hostname server2
|
|
|
|
identityfile ~/.ssh/sitaram
|
|
|
|
|
2009-11-03 09:31:03 +01:00
|
|
|
* now access one server's repos as `gitolite:reponame.git` and the other
|
|
|
|
server's repos as `gitolite2:reponame.git`.
|
|
|
|
|
|
|
|
### further reading
|
|
|
|
|
|
|
|
While this focused mostly on the client side ssh, you may also want to read
|
|
|
|
[this][glb] for a much more detailed explanation of the ssh magic on the
|
|
|
|
server side.
|
|
|
|
|
|
|
|
[glb]: http://sitaramc.github.com/0-installing/9-gitolite-basics.html#IMPORTANT_overview_of_ssh
|