Download as
Browse Code »

Commit 59d2abd177278c63243847342df04a310b56e391

Authored by Jacob Vosmaer
1 parent 38584e92
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Remove stuff we will not need

Showing 1 changed file with 0 additions and 52 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
  Diff comments   View file @59d2abd
... ... @@ -37,41 +37,7 @@ end
37 37  
38 38 should_notify = OmnibusHelper.should_notify?("chef-server-webui")
39 39  
40   -env_config = File.join(chef_server_webui_etc_dir, "#{node['chef_server']['chef-server-webui']['environment']}.rb")
41   -session_store_config = File.join(chef_server_webui_etc_dir, "session_store.rb")
42 40 secret_token_config = File.join(chef_server_webui_etc_dir, "secret_token.rb")
43   -config_ru = File.join(chef_server_webui_etc_dir, "config.ru")
44   -
45   -erchef_url = "http://#{node['chef_server']['erchef']['listen']}"
46   -erchef_url << ":#{node['chef_server']['erchef']['port']}"
47   -
48   -template env_config do
49   - source "chef-server-webui-config.rb.erb"
50   - owner "root"
51   - group "root"
52   - mode "0644"
53   - variables({
54   - :chef_server_url => erchef_url
55   - }.merge(node['chef_server']['chef-server-webui'].to_hash))
56   - notifies :restart, 'service[chef-server-webui]' if should_notify
57   -end
58   -
59   -link "/opt/chef-server/embedded/service/chef-server-webui/config/environments/#{node['chef_server']['chef-server-webui']['environment']}.rb" do
60   - to env_config
61   -end
62   -
63   -template session_store_config do
64   - source "session_store.erb"
65   - owner "root"
66   - group "root"
67   - mode "0644"
68   - variables(node['chef_server']['chef-server-webui'].to_hash)
69   - notifies :restart, 'service[chef-server-webui]' if should_notify
70   -end
71   -
72   -link "/opt/chef-server/embedded/service/chef-server-webui/config/initializers/session_store.rb" do
73   - to session_store_config
74   -end
75 41  
76 42 template secret_token_config do
77 43 source "secret_token.erb"
... ... @@ -86,24 +52,6 @@ link &quot;/opt/chef-server/embedded/service/chef-server-webui/config/initializers/se
86 52 to secret_token_config
87 53 end
88 54  
89   -template config_ru do
90   - source "chef-server-webui.ru.erb"
91   - mode "0644"
92   - owner "root"
93   - group "root"
94   - variables(node['chef_server']['chef-server-webui'].to_hash)
95   - notifies :restart, 'service[chef-server-webui]' if should_notify
96   -end
97   -
98   -file "/opt/chef-server/embedded/service/chef-server-webui/config.ru" do
99   - action :delete
100   - not_if "test -h /opt/chef-server/embedded/service/chef-server-webui/config.ru"
101   -end
102   -
103   -link "/opt/chef-server/embedded/service/chef-server-webui/config.ru" do
104   - to config_ru
105   -end
106   -
107 55 unicorn_listen = node['chef_server']['chef-server-webui']['listen']
108 56 unicorn_listen << ":#{node['chef_server']['chef-server-webui']['port']}"
109 57  
... ...