Commit 1ac8ea99e0326162d6a6f279caa36fdf4b435010

Authored by Jacob Vosmaer
1 parent 5e0f97a2
Exists in master

Remove unnecessary code from nginx recipe

The nginx_vars hash already contains all variables from
node['gitlab']['nginx'].
files/gitlab-cookbooks/gitlab/recipes/nginx.rb
... ... @@ -48,10 +48,6 @@ template nginx_vars[:gitlab_http_config] do
48 48 :https => node['gitlab']['gitlab-rails']['gitlab_https'],
49 49 :socket => node['gitlab']['unicorn']['socket'],
50 50 :port => node['gitlab']['gitlab-rails']['gitlab_port'],
51   - :redirect_http_to_https => node['gitlab']['nginx']['redirect_http_to_https'],
52   - :redirect_http_to_https_port => node['gitlab']['nginx']['redirect_http_to_https_port'],
53   - :ssl_certificate => node['gitlab']['nginx']['ssl_certificate'],
54   - :ssl_certificate_key => node['gitlab']['nginx']['ssl_certificate_key']
55 51 }
56 52 ))
57 53 notifies :restart, 'service[nginx]' if OmnibusHelper.should_notify?("nginx")
... ...