Merge branch '6-9-stable' into 6-9-stable-ee

Jacob Vosmaer
2 parents f7fe7cac d400801a
Showing 1 changed file with 5 additions and 0 deletions Show diff stats
README.md
@@ -88,7 +88,12 @@ The ports for Redis, PostgreSQL and Unicorn can be overriden in
 ```ruby
 redis['port'] = 1234
 postgresql['port'] = 2345
+
+# due to a bug https://gitlab.com/gitlab-org/omnibus-gitlab/issues/141
+# you have to provide the port for gitlab shell as well,
+# so the 2 following lines have to point to the same port
 unicorn['port'] = 3456
+gitlab_rails['internal_api_url'] = 'http://localhost:3456'
 ```
  
 For Nginx port changes please see the section on enabling HTTPS below.
...	...	@@ -88,7 +88,12 @@ The ports for Redis, PostgreSQL and Unicorn can be overriden in
88	88	```ruby
89	89	redis['port'] = 1234
90	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	95	unicorn['port'] = 3456
	96	+gitlab_rails['internal_api_url'] = 'http://localhost:3456'
92	97	```
93	98
94	99	For Nginx port changes please see the section on enabling HTTPS below.
...	...