Commit 264290e7 authored by Ray Paik's avatar Ray Paik

Merge branch 'patch-38' into 'master'

Enhance installation.md grammar

See merge request gitlab-org/gitlab!20068
parents d4aaaffd 87e2b0a0
...@@ -13,7 +13,7 @@ If you want to install on RHEL/CentOS, we recommend using the ...@@ -13,7 +13,7 @@ If you want to install on RHEL/CentOS, we recommend using the
[Omnibus packages](https://about.gitlab.com/install/). [Omnibus packages](https://about.gitlab.com/install/).
This guide is long because it covers many cases and includes all commands you 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). need, this is [one of the few installation scripts that actually work out of the box](https://twitter.com/robinvdvleuten/status/424163226532986880).
The following steps have been known to work. **Use caution when you deviate** The following steps have been known to work. **Use caution when you deviate**
from this guide. Make sure you don't violate any assumptions GitLab makes about 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 its environment. For example, many people run into permission problems because
...@@ -35,7 +35,7 @@ After this termination runit will detect Sidekiq is not running and will start i ...@@ -35,7 +35,7 @@ After this termination runit will detect Sidekiq is not running and will start i
Since installations from source don't use runit for process supervision, Sidekiq Since installations from source don't use runit for process supervision, Sidekiq
can't be terminated and its memory usage will grow over time. can't be terminated and its memory usage will grow over time.
## Select version to install ## Select a version to install
Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install (e.g., `11-7-stable`). Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install (e.g., `11-7-stable`).
You can select the branch in the version dropdown in the top left corner of GitLab (below the menu bar). You can select the branch in the version dropdown in the top left corner of GitLab (below the menu bar).
...@@ -56,7 +56,7 @@ of this page: ...@@ -56,7 +56,7 @@ of this page:
| |-- repositories | |-- repositories
``` ```
- `/home/git/.ssh` - Contains OpenSSH settings. Specifically the `authorized_keys` - `/home/git/.ssh` - Contains OpenSSH settings. Specifically, the `authorized_keys`
file managed by GitLab Shell. file managed by GitLab Shell.
- `/home/git/gitlab` - GitLab core software. - `/home/git/gitlab` - GitLab core software.
- `/home/git/gitlab-shell` - Core add-on component of GitLab. Maintains SSH - `/home/git/gitlab-shell` - Core add-on component of GitLab. Maintains SSH
...@@ -315,7 +315,7 @@ use of extensions and concurrent index removal, you need at least PostgreSQL 9.2 ...@@ -315,7 +315,7 @@ use of extensions and concurrent index removal, you need at least PostgreSQL 9.2
sudo -u postgres psql -d template1 -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;" sudo -u postgres psql -d template1 -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
``` ```
1. Create the GitLab production database and grant all privileges on database: 1. Create the GitLab production database and grant all privileges on the database:
```sh ```sh
sudo -u postgres psql -d template1 -c "CREATE DATABASE gitlabhq_production OWNER git;" sudo -u postgres psql -d template1 -c "CREATE DATABASE gitlabhq_production OWNER git;"
...@@ -397,7 +397,7 @@ sudo usermod -aG redis git ...@@ -397,7 +397,7 @@ sudo usermod -aG redis git
## 8. GitLab ## 8. GitLab
```sh ```sh
# We'll install GitLab into home directory of the user "git" # We'll install GitLab into the home directory of the user "git"
cd /home/git cd /home/git
``` ```
...@@ -424,7 +424,7 @@ cd /home/git/gitlab ...@@ -424,7 +424,7 @@ cd /home/git/gitlab
# Copy the example GitLab config # Copy the example GitLab config
sudo -u git -H cp config/gitlab.yml.example config/gitlab.yml sudo -u git -H cp config/gitlab.yml.example config/gitlab.yml
# Update GitLab config file, follow the directions at top of file # Update GitLab config file, follow the directions at top of the file
sudo -u git -H editor config/gitlab.yml sudo -u git -H editor config/gitlab.yml
# Copy the example secrets file # Copy the example secrets file
...@@ -465,7 +465,7 @@ nproc ...@@ -465,7 +465,7 @@ nproc
# Enable cluster mode if you expect to have a high load instance # Enable cluster mode if you expect to have a high load instance
# Set the number of workers to at least the number of cores # Set the number of workers to at least the number of cores
# Ex. change amount of workers to 3 for 2GB RAM server # Ex. change the amount of workers to 3 for 2GB RAM server
sudo -u git -H editor config/unicorn.rb sudo -u git -H editor config/unicorn.rb
# Copy the example Rack attack config # Copy the example Rack attack config
...@@ -670,7 +670,7 @@ sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production ...@@ -670,7 +670,7 @@ sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production
# or you can skip the question by adding force=yes # or you can skip the question by adding force=yes
sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production force=yes sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production force=yes
# When done you see 'Administrator account created:' # When done, you see 'Administrator account created:'
``` ```
NOTE: **Note:** NOTE: **Note:**
...@@ -684,7 +684,7 @@ sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PA ...@@ -684,7 +684,7 @@ sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PA
The `secrets.yml` file stores encryption keys for sessions and secure variables. The `secrets.yml` file stores encryption keys for sessions and secure variables.
Backup `secrets.yml` someplace safe, but don't store it in the same place as your database backups. Backup `secrets.yml` someplace safe, but don't store it in the same place as your database backups.
Otherwise your secrets are exposed if one of your backups is compromised. Otherwise, your secrets are exposed if one of your backups is compromised.
### Install Init Script ### Install Init Script
...@@ -835,7 +835,7 @@ initial administrator account. Enter your desired password and you'll be ...@@ -835,7 +835,7 @@ initial administrator account. Enter your desired password and you'll be
redirected back to the login screen. redirected back to the login screen.
The default account's username is **root**. Provide the password you created The default account's username is **root**. Provide the password you created
earlier and login. After login you can change the username if you wish. earlier and login. After login, you can change the username if you wish.
**Enjoy!** **Enjoy!**
...@@ -905,7 +905,7 @@ for the changes to take effect. ...@@ -905,7 +905,7 @@ for the changes to take effect.
### Custom Redis Connection ### Custom Redis Connection
If you'd like to connect to a Redis server on a non-standard port or on a different host, you can configure its connection string via the `config/resque.yml` file. If you'd like to connect to a Redis server on a non-standard port or a different host, you can configure its connection string via the `config/resque.yml` file.
``` ```
# example # example
...@@ -921,7 +921,7 @@ production: ...@@ -921,7 +921,7 @@ production:
url: unix:/path/to/redis/socket url: unix:/path/to/redis/socket
``` ```
Also you can use environment variables in the `config/resque.yml` file: Also, you can use environment variables in the `config/resque.yml` file:
``` ```
# example # example
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment