Merge branch 'fix_redirect_http_to_https' into 'master'

Fix redirect_http_to_https option This is a fix for issue #137

Merge branch 'fix_redirect_http_to_https' into 'master'
Fix redirect_http_to_https option This is a fix for issue #137
Jacob Vosmaer
2 parents 1319092a 33ed7ce6
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
@@ -29,6 +29,8 @@ server {
   server_name <%= @fqdn %>;
   server_tokens off;
   return 301 https://<%= @fqdn %>:<%= @port %>$request_uri;
+  access_log  <%= @log_directory %>/gitlab_access.log;
+  error_log   <%= @log_directory %>/gitlab_error.log;
 }
 <% end %>
...	...	@@ -29,6 +29,8 @@ server {
29	29	server_name <%= @fqdn %>;
30	30	server_tokens off;
31	31	return 301 https://<%= @fqdn %>:<%= @port %>$request_uri;
	32	+ access_log <%= @log_directory %>/gitlab_access.log;
	33	+ error_log <%= @log_directory %>/gitlab_error.log;
32	34	}
33	35	<% end %>
34	36
...	...