Merge branch 'forward_port' into 'master'

Pass the redirect port to the nginx template.

Pass the port to the redirect line in nginx conf.

Fixes #774

See merge request !468

files/gitlab-cookbooks/gitlab/libraries/gitlab.rb

@@ -251,6 +251,7 @@ module Gitlab
       [
         [%w{nginx listen_port}, %w{gitlab_rails gitlab_port}],
         [%w{ci_nginx listen_port}, %w{gitlab_ci gitlab_ci_port}],
+        [%w{mattermost_nginx listen_port}, %w{mattermost port}]
 
       ].each do |left, right|
         if !Gitlab[left.first][left.last].nil?
@@ -332,7 +333,7 @@ module Gitlab
         raise "Unsupported CI external URL path: #{uri.path}"
       end
 
-      Gitlab['mattermost_nginx']['listen_port'] = uri.port
+      Gitlab['mattermost']['port'] = uri.port
     end
 
     def parse_gitlab_mattermost
@@ -398,11 +399,11 @@ module Gitlab
       # Parse ci_external_url _before_ gitlab_ci settings so that the user
       # can turn on gitlab_ci by only specifying ci_external_url
       parse_ci_external_url
+      parse_mattermost_external_url
       parse_unicorn_listen_address
       parse_nginx_listen_address
       parse_nginx_listen_ports
       parse_gitlab_ci
-      parse_mattermost_external_url
       parse_gitlab_mattermost
       disable_gitlab_rails_services
       # The last step is to convert underscores to hyphens in top-level keys

files/gitlab-cookbooks/gitlab/recipes/nginx.rb

@@ -91,6 +91,7 @@ template gitlab_rails_http_conf do
   variables(nginx_vars.merge(
     {
       :fqdn => node['gitlab']['gitlab-rails']['gitlab_host'],
+      :port => node['gitlab']['gitlab-rails']['gitlab_port'],
       :socket => node['gitlab']['unicorn']['socket'],
       :kerberos_enabled => node['gitlab']['gitlab-rails']['kerberos_enabled'],
       :kerberos_use_dedicated_port => node['gitlab']['gitlab-rails']['kerberos_use_dedicated_port'],
@@ -118,6 +119,7 @@ template gitlab_ci_http_conf do
   variables(ci_nginx_vars.merge(
     {
       :fqdn => node['gitlab']['gitlab-ci']['gitlab_ci_host'],
+      :port => node['gitlab']['gitlab-ci']['gitlab_ci_port'],
       :socket => node['gitlab']['ci-unicorn']['socket']
     }
   ))
@@ -141,6 +143,7 @@ template gitlab_mattermost_http_conf do
   variables(mattermost_nginx_vars.merge(
    {
      :fqdn => node['gitlab']['mattermost']['host'],
+     :port => node['gitlab']['mattermost']['port'],
      :service_port => node['gitlab']['mattermost']['service_port']
    }
   ))