Download as
Browse Code »

Commit 4c7bd25ba8788e69b1c45bb284d4605a5e1efd08

Authored by Jacob Vosmaer
2 parents 5f988532 bb34693a
Exists in master and in 9 other branches 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'master' into 'master' 

Add Documentation to avoid confusion regarding Issue #141

This Documentation fix is related to #141
Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
@@ -88,7 +88,12 @@ The ports for Redis, PostgreSQL and Unicorn can be overriden in @@ -88,7 +88,12 @@ The ports for Redis, PostgreSQL and Unicorn can be overriden in
88 ```ruby 88 ```ruby
89 redis['port'] = 1234 89 redis['port'] = 1234
90 postgresql['port'] = 2345 90 postgresql['port'] = 2345
  91 +
  92 +# due to a bug https://gitlab.com/gitlab-org/omnibus-gitlab/issues/141
  93 +# you have to provide the port for gitlab shell as well,
  94 +# so the 2 following lines have to point to the same port
91 unicorn['port'] = 3456 95 unicorn['port'] = 3456
  96 +gitlab_rails['internal_api_url'] = 'http://localhost:3456'
92 ``` 97 ```
93 98
94 For Nginx port changes please see the section on enabling HTTPS below. 99 For Nginx port changes please see the section on enabling HTTPS below.
@@ -531,4 +536,4 @@ This omnibus installer project is based on the awesome work done by Chef in @@ -531,4 +536,4 @@ This omnibus installer project is based on the awesome work done by Chef in
531 [gitlab.yml.erb]: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb 536 [gitlab.yml.erb]: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
532 [database.yml.postgresql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.postgresql 537 [database.yml.postgresql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.postgresql
533 [database.yml.mysql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.mysql 538 [database.yml.mysql]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/database.yml.mysql
534 -[gitlab.yml.example]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example 539 -[gitlab.yml.example]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example
  540 +[gitlab.yml.example]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example
535 \ No newline at end of file 541 \ No newline at end of file