summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/databases.md2
-rw-r--r--doc/install/installation.md22
-rw-r--r--doc/install/requirements.md10
3 files changed, 23 insertions, 11 deletions
diff --git a/doc/install/databases.md b/doc/install/databases.md
index 6016e97ede5..1d9405dfa96 100644
--- a/doc/install/databases.md
+++ b/doc/install/databases.md
@@ -52,7 +52,7 @@ GitLab supports the following databases:
## PostgreSQL
# Install the database packages
- sudo apt-get install -y postgresql-9.1 libpq-dev
+ sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev
# Login to PostgreSQL
sudo -u postgres psql -d template1
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 02f713e7611..0d7f126167b 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -2,19 +2,21 @@
Make sure you view this installation guide from the branch (version) of GitLab you would like to install. In most cases
this should be the highest numbered stable branch (example shown below).
-![capture](https://f.cloud.github.com/assets/1192780/564911/2f9f3e1e-c5b7-11e2-9f89-98e527d1adec.png)
+![capture](http://i.imgur.com/d2AlIVj.png)
If this is unclear check the [GitLab Blog](http://blog.gitlab.org/) for installation guide links by version.
# Important notes
-This installation guide was created for and tested on **Debian/Ubuntu** operating systems. Please read [`doc/install/requirements.md`](./requirements.md) for hardware and operating system requirements.
+This guide is long because it covers many cases and includes all commands you need, this is [one of the few installation scripts that actually works out of the box](https://twitter.com/robinvdvleuten/status/424163226532986880).
+
+This installation guide was created for and tested on **Debian/Ubuntu** operating systems. Please read [doc/install/requirements.md](./requirements.md) for hardware and operating system requirements.
This is the official installation guide to set up a production server. To set up a **development installation** or for many other installation options please consult [the installation section in the readme](https://github.com/gitlabhq/gitlabhq#installation).
The following steps have been known to work. Please **use caution when you deviate** from this guide. Make sure you don't violate any assumptions GitLab makes about its environment. For example many people run into permission problems because they changed the location of directories or run services as the wrong user.
-If you find a bug/error in this guide please **submit a pull request** following the [contributing guide](../../CONTRIBUTING.md).
+If you find a bug/error in this guide please **submit a merge request** following the [contributing guide](../../CONTRIBUTING.md).
- - -
@@ -111,6 +113,8 @@ Then select 'Internet Site' and press enter to confirm the hostname.
# 2. Ruby
+The use of ruby version managers such as [RVM](http://rvm.io/), [rbenv](https://github.com/sstephenson/rbenv) or [chruby](https://github.com/postmodern/chruby) with GitLab in production frequently leads to hard to diagnose problems. Version managers are not supported and we stronly advise everyone to follow the instructions below to use a system ruby.
+
Remove the old Ruby 1.8 if present
sudo apt-get remove ruby1.8
@@ -144,7 +148,7 @@ GitLab Shell is an ssh access and repository management software developed speci
cd /home/git
# Clone gitlab shell
- sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git -b v1.8.0
+ sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.8.0
cd gitlab-shell
@@ -171,13 +175,13 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
## Clone the Source
# Clone GitLab repository
- sudo -u git -H git clone https://github.com/gitlabhq/gitlabhq.git -b 6-4-stable gitlab
+ sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-5-stable gitlab
# Go to gitlab dir
cd /home/git/gitlab
**Note:**
-You can change `6-4-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+You can change `6-5-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
## Configure it
@@ -313,7 +317,7 @@ Check if GitLab and its environment are configured correctly:
**Note:**
Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the
-[GitLab recipes](https://github.com/gitlabhq/gitlab-recipes).
+[GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/).
## Installation
sudo apt-get install -y nginx
@@ -408,9 +412,9 @@ These steps are fairly general and you will need to figure out the exact details
* Stop GitLab
`sudo service gitlab stop`
-* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://github.com/gitlabhq/gitlabhq/blob/master/config/gitlab.yml.example) as a reference)
+* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example) as a reference)
-* Add the gem to your [Gemfile](https://github.com/gitlabhq/gitlabhq/blob/master/Gemfile)
+* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/masterGemfile)
`gem "omniauth-your-auth-provider"`
* If you're using MySQL, install the new Omniauth provider gem by running the following command:
`sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment`
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index e9c95ba2ef9..0a1539fb0d6 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -55,7 +55,7 @@ it might require some work since GitLab uses several Gems that have native exten
- 512MB is too little memory, GitLab will be very slow and you will need 250MB of swap
- 768MB is the minimal memory size but we advise against this
-- 1GB supports up to 100 users if you do not have individual repo's over 250MB
+- 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates using swap space)
- **2GB** is the **recommended** memory size and supports up to 1,000 users
- 4GB supports up to 10,000 users
@@ -76,3 +76,11 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim
If you have troubles installing GitLab following the [official installation guide](installation.md)
or want to share your experience installing GitLab on a not officially supported
platform, please follow the the [contribution guide](/CONTRIBUTING.md).
+
+# Supported webbrowsers
+
+- Chrome (Latest stable version)
+- Firefox (Latest released version)
+- Safari 7+ (Know problem: required fields in html5 do not work)
+- Opera (Latest released version)
+- IE 10+