个人工具

UbuntuHelp:Git

来自Ubuntu中文

跳转至: 导航, 搜索

Introduction

Git is an open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Every Git clone is a full-fledged repository with complete history and full revision tracking capabilities, not dependent on network access or a central server. Branching and merging are fast and easy to do.

Installation

Following these instructions we assume you already have a Ubuntu 9.04 installed on you computer/server and that you already have a public ssh key on your machine you can use that to initialize the repository (Don't have one, look here). The following instructions will guide you on how to set up and run a fully managed hosting for projects using git on your server.

Used software

This tutorial was done using an Ubuntu 9.04 (Jaunty Jackalope). We'll be using the latest git package available in the archive. For git project management will be using Gitosis. For repository web browsing we will be using ViewGit. The latest version we will clone directly from a git repository: git clone git://repo.or.cz/viewgit.git

Setting up Git and Project Management

Use your favorite package installer to install git-core and gitosis packages:

apt-get -y install git-core gitosis

Now that you should have both packages installed, we can set up gitosis. First copy your public key to the server:

scp .ssh/id_rsa.pub [email protected]:/tmp

Initialize gitosis using your copied key:

sudo -H -u gitosis gitosis-init < /tmp/id_rsa.pub

Once you saw some output like this: `Initialized empty Git repository in ./` Your gitosis is installed. You can now remove the copied key.

rm /tmp/id_rsa.pub

Once done, you can now checkout the gitosis-admin branch on your local machine:

git clone [email protected]:gitosis-admin.git

Note: If the cloning doesn't work, maybe you have "PermitRootLogin no" in the SSH Server and you need to add gitosis user to it.

sudo vim /etc/ssh/sshd_config
AllowUsers gitosis

Use your favorite editor to modify the contents of the gitosis configuration file:

cd gitosis-admin
vim gitosis.conf

Adding a new project to the repository

Here is an example of the gitosis configuration file you clone before. Here it contains the default gitosis entry, and a new project entry:

[gitosis]

[group team]
writable = testproject
members = hostname.yourserver.com

[group gitosis-admin]
writable = gitosis-admin
members = keyfilename

`hostname.yourserver.com` or `keyfilename` is the name of the public key without `.pub` extension you copied into `gitosis-admin/keydir/` directory. After you've done editing, save the file, and commit it back to the server.

git commit -a -m "Added a new project"
git push

Any future projects will be added the same way.

Committing to the first project

To commit the project you just created, initiate a new git project, add files to it, commit it, then push it to your repository with the name you set up in gitosis config file.

mkdir testproject
cd testproject
git init
touch a_text_file.txt
git add .
git commit -a -m "Initial import"
git remote add origin [email protected]:testproject.git
git push origin master

The project should be committed! {i} If not, please check your `/srv/gitosis/.ssh/authorized_keys` file, if that one contains your correct public key!

Adding users

First, gather their public SSH keys, which I'll call "kakashi.pub" and "naruto.pub", and drop them into keydir/ of your local gitosis-admin repository. Second, edit gitosis.conf and add them to the "members" list.

cd gitosis-admin
cp ~/kakashi.pub keydir/
cp ~/naruto.pub keydir/
git add keydir/kakashi.pub keydir/naruto.pub

Note that the key filename must have a ".pub" extension. gitosis.conf changes:

 [group team]
  writable = testproject
- members = hostname.yourserver.com
+ members = hostname.yourserver.com kakashi naruto

Commit and push:

git commit -a -m "Granted Kakashi and Naruto commit rights to testproject"
git push

That's it. Kakashi and Naruto can now clone the testproject repository like so:

git clone [email protected]:testproject.git

Kakashi and Naruto will also have commit rights.

The web browsing interface

Server will need a web server so I recommend you to install Apache with support for php. Once ViewGit can be linked to GeSHI, I also recommend you installing the `php-geshi` package:

sudo apt-get install apache2 libapache2-mod-php5 php-geshi

{i} For more extended Apache installation we recommend you reading a dedicated page like this ApacheMySQLPHP. Once done, `/var/www/` directory will be created. Go there and clone the latest git version of ViewGIT:

cd /var/www
sudo git clone git://repo.or.cz/viewgit.git
sudo chown -vR www-data:www-data viewgit

After finishing this operation, use your favorite editor to edit the config file for ViewGit:

cd /var/www/viewgit/inc
sudo cp config.php localconfig.php
sudo chown www-data:www-data localconfig.php
sudo vim localconfig.php

Here is an example of the ViewGit `localconfig.php` with GeSHI and the testproject.git we created:

<nowiki>
<?php
$conf['projects'] = array(
	'projectname' => array('repo' => '/srv/gitosis/repositories/testproject.git/'),
);

// Where git is. Default is to search from PATH, but you can use an absolute
// path as well.
$conf['git'] = 'git';

// If set, contains an array of globs/wildcards where to include projects.
// Use this if you have a lot of projects under a directory.
//$conf['projects_glob'] = array('/path/to/*/.git', '/var/git/*.git');

$conf['datetime'] = '%Y-%m-%d %H:%M';

// More complete format for commit page
$conf['datetime_full'] = '%Y-%m-%d %H:%M:%S';

// Maximum length of commit message's first line to show
$conf['commit_message_maxlen'] = 50;

// Maximum number of shortlog entries to show on the summary page
$conf['summary_shortlog'] = 30;

// Maximum number of tags to show on the summary page
$conf['summary_tags'] = 10;

// Whether to show remote labels on shortlog
$conf['shortlog_remote_labels'] = false;

// Allow checking out projects via "git clone"
$conf['allow_checkout'] = true;

// If set, this function is used to obfuscate e-mail addresses of authors/committers
// The 'obfuscate_mail' function simply replaces @ with ' at ' and . with ' dot '
//$conf['mail_filter'] = 'obfuscate_mail';
//$conf['mail_filter'] = create_function('$mail', 'return str_rot13(strtoupper($mail));');

// Whether to use GeSHi for source highlighting
$conf['geshi'] = true;

// Path to geshi.php
$conf['geshi_path'] = 'inc/geshi/geshi.php';
$conf['geshi_path'] = '/usr/share/php-geshi/geshi.php'; // Path on Debian

// Use line numbers in geshi?
// Setting this to "false" disables line numbers
// Using a value of 0 will enable "NORMAL" geshi line numbers
// Using values of 1 or more will enable "FANCY" geshi line numbers
$conf['geshi_line_numbers'] = 5;

// RSS time to live (how often clients should update the feed), in minutes.
$conf['rss_ttl'] = 10;

// RSS: Maximum number of items in feed
$conf['rss_max_items'] = 30;

// RSS item format. Allowed formatting:
// {AUTHOR}, {AUTHOR_MAIL}, {SHORTLOG}, {LOG}, {COMMITTER}, {COMMITTER_MAIL}, {DIFFSTAT}
$conf['rss_item_title'] = '{SHORTLOG} ({AUTHOR})';
$conf['rss_item_description'] = '<pre>{LOG}
{AUTHOR} <{AUTHOR_MAIL}>
{DIFFSTAT}
';

$conf['debug'] = false;

// Includes a small link to the ViewGit homepage on each page $conf['ad'] = false; </nowiki></pre> Now you should be able to browse your Git repository by going to http://localhost/viewgit/ if you got problems on accessing repositories, add your web server user to the same group gitosis user is:

adduser www-data git

Making available public cloning of the projects

To make available public access for cloning of the projects, you have to set up git-daemon. git-daemon is a service which runs on port `9418` and handles public requests for project cloning. git-daemon comes together with git-core so no additional installation is required. To make this service easier to administrate, here is an init script to start and stop the daemon. It is, however, easier to make git a subservice of xinetd, by editing /etc/xinetd.d/git and changing disable=no to disable=yes.

#! /bin/sh

# Taken from here: http://pastie.org/227647

PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=git-daemon
PIDFILE=/var/run/$NAME.pid
DESC="the git daemon"
DAEMON=/usr/lib/git-core/git-daemon
DAEMON_OPTS="--base-path=/srv/gitosis/repositories --export-all --verbose --syslog --detach --pid-file=$PIDFILE --user=gitosis --group=nogroup"

test -x $DAEMON || exit 0

[ -r /etc/default/git-daemon ] && . /etc/default/git-daemon

. /lib/lsb/init-functions

start_git() {
  start-stop-daemon --start --quiet --pidfile $PIDFILE \
    --startas $DAEMON -- $DAEMON_OPTS
}

stop_git() {
  start-stop-daemon --stop --quiet --pidfile $PIDFILE
  rm -f $PIDFILE
}

status_git() {
  start-stop-daemon --stop --test --quiet --pidfile $PIDFILE >/dev/null 2>&1
}

case "$1" in
  start)
  log_begin_msg "Starting $DESC"
  start_git
  log_end_msg 0
  ;;
  stop)
  log_begin_msg "Stopping $DESC"
  stop_git
  log_end_msg 0
  ;;
  status)
  log_begin_msg "Testing $DESC: "
  if status_git
  then
    log_success_msg "Running"
    exit 0
  else
    log_failure_msg "Not running"
    exit 1
  fi
  ;;
  restart|force-reload)
  log_begin_msg "Restarting $DESC"
  stop_git
  sleep 1
  start_git
  log_end_msg 0
  ;;
  *)
  echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2
  exit 1
  ;;
esac

exit 0

To make it usable, and make possible it's automatic startup on server boot change its permissions and update-rc.d

sudo chmod +x /etc/init.d/git-daemon
sudo update-rc.d git-daemon defaults

The daemon can be started or stoped by accesing:

sudo /etc/init.d/git-daemon start
sudo /etc/init.d/git-daemon stop