Merge branch 'http_redirect_listen_address' into 'master'

Also use new NGINX listen_addresses for redirect See merge request !186

Merge branch 'http_redirect_listen_address' into 'master'
Also use new NGINX listen_addresses for redirect See merge request !186
Jacob Vosmaer
2 parents d514e96f df971723
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
@@ -25,7 +25,9 @@ upstream gitlab {
  
 <% if @https && @redirect_http_to_https %>
 server {
-  listen <%= @listen_address %>:<%= @redirect_http_to_https_port %>;
+<% @listen_addresses.each do |listen_address| %>
+  listen <%= listen_address %>:<%= @redirect_http_to_https_port %>;
+<% end %>
   server_name <%= @fqdn %>;
   server_tokens off;
   return 301 https://<%= @fqdn %>:<%= @port %>$request_uri;
...	...	@@ -25,7 +25,9 @@ upstream gitlab {
25	25
26	26	<% if @https && @redirect_http_to_https %>
27	27	server {
28		- listen <%= @listen_address %>:<%= @redirect_http_to_https_port %>;
	28	+<% @listen_addresses.each do \|listen_address\| %>
	29	+ listen <%= listen_address %>:<%= @redirect_http_to_https_port %>;
	30	+<% end %>
29	31	server_name <%= @fqdn %>;
30	32	server_tokens off;
31	33	return 301 https://<%= @fqdn %>:<%= @port %>$request_uri;
...	...