diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-10 07:26:13 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-10 07:26:13 +0000 |
commit | 5830d672f7caf8c4a2d0dcc63f9a096523b3cb32 (patch) | |
tree | 9847c471f840802c0a3387204ec6e48f1ef375fa | |
parent | 89ecb191260ac4db334b851d829c94949c3469b7 (diff) | |
parent | 355b120224444d5de9b4c759c7388b14ff6b157c (diff) | |
download | gitlab-ce-5830d672f7caf8c4a2d0dcc63f9a096523b3cb32.tar.gz |
Merge branch 'no-link-to-centos-guide' into 'master'
No link to centos guide
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | doc/install/installation.md | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/README.md b/README.md index 374f4aee8f3..7764e0a29f2 100644 --- a/README.md +++ b/README.md @@ -45,13 +45,11 @@ #### Official installation methods -* [GitLab packages](https://www.gitlab.com/downloads/) These packages contain GitLab and all its depencies (Ruby, PostgreSQL, Redis, Nginx, Unicorn, etc.). They are made with [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md) that also contains the installation instructions. - -* [GitLab virtual machine images](https://www.gitlab.com/downloads/) contain an operating system and a preinstalled GitLab. They are made with [GitLab Packer](https://gitlab.com/gitlab-org/gitlab-packer/blob/master/README.md) that also contains the installation instructions. +* [GitLab packages](https://www.gitlab.com/downloads/) **recommended** These packages contain GitLab and all its depencies (Ruby, PostgreSQL, Redis, Nginx, Unicorn, etc.). They are made with [omnibus-gitlab](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md) that also contains the installation instructions. * [GitLab Chef Cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md) This cookbook can be used both for development installations and production installations. If you want to [contribute](CONTRIBUTE.md) to GitLab we suggest you follow the [development installation on a virtual machine with Vagrant](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/development.md) instructions to install all testing dependencies. -* [Manual installation guide](doc/install/installation.md) This guide to set up a production server offers detailed and complete step-by-step instructions. +* [Manual installation guide](doc/install/installation.md) This guide to set up a production server on Ubuntu offers detailed and complete step-by-step instructions. #### Third party one-click installers diff --git a/doc/install/installation.md b/doc/install/installation.md index 43061ee8d27..0c99ef81815 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -10,7 +10,7 @@ If this is unclear check the [GitLab Blog](https://www.gitlab.com/blog/) for ins 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. An unofficial guide for RHEL/CentOS can be found in the [GitLab recipes repository](https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/install/centos). +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. If you want to install on RHEL/CentOS we recommend using the [Omnibus packages](https://www.gitlab.com/downloads/). 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 see [the installation section of the readme](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#installation). |