diff options
| author | Evan Read <eread@gitlab.com> | 2019-05-13 21:24:05 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-05-14 16:30:53 +0000 |
| commit | b92d752e4483873684dfd92a720610867da2dbfc (patch) | |
| tree | 1fa0b7fed840884cdd8dd9c36fa890f5b7db2a80 | |
| parent | 1225d14256b41dabcd4d746d82c2641be5048dbf (diff) | |
| download | gitlab-ce-b92d752e4483873684dfd92a720610867da2dbfc.tar.gz | |
Merge branch 'docs/improve-installation-from-source' into 'master'
Improve installation from source
Closes #47483, #61549, and #50937
See merge request gitlab-org/gitlab-ce!28201
(cherry picked from commit 0a7216ab6eccf5607d5c526c1deea235f0f7462e)
fe83b461 Improve installation from source
ae123b49 Minor improvements for installation doc
| -rw-r--r-- | doc/install/installation.md | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index c694f0ed691..9548aee5fe3 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -448,6 +448,18 @@ sudo -u git cp config/database.yml.postgresql config/database.yml # MySQL only: sudo -u git cp config/database.yml.mysql config/database.yml +# PostgreSQL only: +# Remove host, username, and password lines from config/database.yml. +# Once modified, the `production` settings will be as follows: +# +# production: +# adapter: postgresql +# encoding: unicode +# database: gitlabhq_production +# pool: 10 +# +sudo -u git -H editor config/database.yml + # MySQL and remote PostgreSQL only: # Update username/password in config/database.yml. # You only need to adapt the production settings (first part). @@ -565,6 +577,18 @@ sudo -u git -H editor config.toml For more information about configuring Gitaly see [doc/administration/gitaly](../administration/gitaly). +### Start Gitaly + +Gitaly must be running for the next section. + +```sh +gitlab_path=/home/git/gitlab +gitaly_path=/home/git/gitaly + +sudo -u git -H $gitlab_path/bin/daemon_with_pidfile $gitlab_path/tmp/pids/gitaly.pid \ + $gitaly_path/gitaly $gitaly_path/config.toml >> $gitlab_path/log/gitaly.log 2>&1 & +``` + ### Initialize Database and Activate Advanced Features ```sh @@ -640,6 +664,12 @@ sudo -u git -H yarn install --production --pure-lockfile sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production ``` +If `rake` fails with `JavaScript heap out of memory` error, try to run it with `NODE_OPTIONS` set as follows. + +```sh +sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" +``` + ### Start Your GitLab Instance ```sh |