From 4c61538b820953c4cf72fd1502d9eae42ffbf042 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 21 Oct 2013 12:53:23 +0200 Subject: [PATCH 1/5] Add instructions to install Git from source This is needed for Ubuntu 12.04, which only provides Git 1.7.9. --- doc/install/installation.md | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index d0be2325aac..5eb65e11494 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -52,7 +52,7 @@ If you are not familiar with vim please skip this and keep using the default edi Install the required packages: - sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl git-core openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate + sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate Make sure you have the right version of Python installed. @@ -74,6 +74,34 @@ Make sure you have the right version of Python installed. # For reStructuredText markup language support install required package: sudo apt-get install -y python-docutils +Make sure you have the right version of Git installed + + # Install Git + sudo apt-get install -y git-core + + # Make sure Git is version 1.7.10 or higher + git --version + + # System packaged Git too old? Remove it and compile from source. + + # Remove packaged Git + sudo apt-get remove git-core + + # Install dependencies + sudo apt-get install -y libexpat1-dev gettext + + # Download and compile from source + cd /tmp + curl --progress https://git-core.googlecode.com/files/git-1.8.4.1.tar.gz | tar xz + cd git-1.8.4.1/ + make prefix=/usr/local all + + # Install into /usr/local/bin + sudo make prefix=/usr/local install + + # Create a symlink for GitLab + sudo ln -s /usr/local/bin/git /usr/bin/git + **Note:** In order to receive mail notifications, make sure to install a mail server. By default, Debian is shipped with exim4 whereas Ubuntu does not ship with one. The recommended mail server is postfix and you can install it with: From 79ac0e9b3e19b3f606fb2ca3cf9ed9363cf0ddf9 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 22 Oct 2013 14:37:06 +0200 Subject: [PATCH 2/5] Edit config/gitlab.yml when compiling git --- doc/install/installation.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 5eb65e11494..3ce47d2ef2e 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -99,8 +99,7 @@ Make sure you have the right version of Git installed # Install into /usr/local/bin sudo make prefix=/usr/local install - # Create a symlink for GitLab - sudo ln -s /usr/local/bin/git /usr/bin/git + # When editing config/gitlab.yml (Step 6), change the git bin_path to /usr/local/bin/git **Note:** In order to receive mail notifications, make sure to install a mail server. By default, Debian is shipped with exim4 whereas Ubuntu @@ -195,6 +194,8 @@ You can change `6-1-stable` to `master` if you want the *bleeding edge* version, # Make sure to change "localhost" to the fully-qualified domain name of your # host serving GitLab where necessary + # + # If you installed Git from source, change the git bin_path to /usr/local/bin/git sudo -u git -H editor config/gitlab.yml # Make sure GitLab can write to the log/ and tmp/ directories From e7b6a42f26cd7998e5fa26387b054723b1003fe5 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 22 Oct 2013 14:41:08 +0200 Subject: [PATCH 3/5] Divide Git installation instructions in two --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 3ce47d2ef2e..c5086c2ee5d 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -82,7 +82,7 @@ Make sure you have the right version of Git installed # Make sure Git is version 1.7.10 or higher git --version - # System packaged Git too old? Remove it and compile from source. +Is the system packaged Git too old? Remove it and compile from source. # Remove packaged Git sudo apt-get remove git-core From 01c65ac58631474d3b96bb253dfd32b046f8dd30 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 22 Oct 2013 14:43:00 +0200 Subject: [PATCH 4/5] Include full dependencies for Git compilation --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index c5086c2ee5d..f97954b5da9 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -88,7 +88,7 @@ Is the system packaged Git too old? Remove it and compile from source. sudo apt-get remove git-core # Install dependencies - sudo apt-get install -y libexpat1-dev gettext + sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev build-essential # Download and compile from source cd /tmp From 56863dcbe3b1474b091c87702d94c8c224324b44 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 22 Oct 2013 14:34:19 +0200 Subject: [PATCH 5/5] Clarify that Git 1.8.x is OK --- doc/install/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index f97954b5da9..a4b88f0ce4d 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -79,7 +79,7 @@ Make sure you have the right version of Git installed # Install Git sudo apt-get install -y git-core - # Make sure Git is version 1.7.10 or higher + # Make sure Git is version 1.7.10 or higher, for example 1.7.12 or 1.8.4 git --version Is the system packaged Git too old? Remove it and compile from source.