Commit 2f132f1893350776783c436a17aeb9fb697e9e29

Authored by Jacob Vosmaer
1 parent 59d2abd1

Rename chef-server-webui to gitlab-core

files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
@@ -15,75 +15,75 @@ @@ -15,75 +15,75 @@
15 # limitations under the License. 15 # limitations under the License.
16 # 16 #
17 17
18 -chef_server_webui_dir = node['chef_server']['chef-server-webui']['dir']  
19 -chef_server_webui_etc_dir = File.join(chef_server_webui_dir, "etc")  
20 -chef_server_webui_working_dir = File.join(chef_server_webui_dir, "working")  
21 -chef_server_webui_tmp_dir = File.join(chef_server_webui_dir, "tmp")  
22 -chef_server_webui_log_dir = node['chef_server']['chef-server-webui']['log_directory'] 18 +gitlab_core_dir = node['gitlab']['gitlab-core']['dir']
  19 +gitlab_core_etc_dir = File.join(gitlab_core_dir, "etc")
  20 +gitlab_core_working_dir = File.join(gitlab_core_dir, "working")
  21 +gitlab_core_tmp_dir = File.join(gitlab_core_dir, "tmp")
  22 +gitlab_core_log_dir = node['gitlab']['gitlab-core']['log_directory']
23 23
24 [ 24 [
25 - chef_server_webui_dir,  
26 - chef_server_webui_etc_dir,  
27 - chef_server_webui_working_dir,  
28 - chef_server_webui_tmp_dir,  
29 - chef_server_webui_log_dir 25 + gitlab_core_dir,
  26 + gitlab_core_etc_dir,
  27 + gitlab_core_working_dir,
  28 + gitlab_core_tmp_dir,
  29 + gitlab_core_log_dir
30 ].each do |dir_name| 30 ].each do |dir_name|
31 directory dir_name do 31 directory dir_name do
32 - owner node['chef_server']['user']['username'] 32 + owner node['gitlab']['user']['username']
33 mode '0700' 33 mode '0700'
34 recursive true 34 recursive true
35 end 35 end
36 end 36 end
37 37
38 -should_notify = OmnibusHelper.should_notify?("chef-server-webui") 38 +should_notify = OmnibusHelper.should_notify?("gitlab-core")
39 39
40 -secret_token_config = File.join(chef_server_webui_etc_dir, "secret_token.rb") 40 +secret_token_config = File.join(gitlab_core_etc_dir, "secret_token.rb")
41 41
42 template secret_token_config do 42 template secret_token_config do
43 source "secret_token.erb" 43 source "secret_token.erb"
44 owner "root" 44 owner "root"
45 group "root" 45 group "root"
46 mode "0644" 46 mode "0644"
47 - variables(node['chef_server']['chef-server-webui'].to_hash)  
48 - notifies :restart, 'service[chef-server-webui]' if should_notify 47 + variables(node['gitlab']['gitlab-core'].to_hash)
  48 + notifies :restart, 'service[gitlab-core]' if should_notify
49 end 49 end
50 50
51 -link "/opt/chef-server/embedded/service/chef-server-webui/config/initializers/secret_token.rb" do 51 +link "/opt/gitlab/embedded/service/gitlab-core/config/initializers/secret_token.rb" do
52 to secret_token_config 52 to secret_token_config
53 end 53 end
54 54
55 -unicorn_listen = node['chef_server']['chef-server-webui']['listen']  
56 -unicorn_listen << ":#{node['chef_server']['chef-server-webui']['port']}" 55 +unicorn_listen = node['gitlab']['gitlab-core']['listen']
  56 +unicorn_listen << ":#{node['gitlab']['gitlab-core']['port']}"
57 57
58 -unicorn_config File.join(chef_server_webui_etc_dir, "unicorn.rb") do 58 +unicorn_config File.join(gitlab_core_etc_dir, "unicorn.rb") do
59 listen unicorn_listen => { 59 listen unicorn_listen => {
60 - :backlog => node['chef_server']['chef-server-webui']['backlog'],  
61 - :tcp_nodelay => node['chef_server']['chef-server-webui']['tcp_nodelay'] 60 + :backlog => node['gitlab']['gitlab-core']['backlog'],
  61 + :tcp_nodelay => node['gitlab']['gitlab-core']['tcp_nodelay']
62 } 62 }
63 - worker_timeout node['chef_server']['chef-server-webui']['worker_timeout']  
64 - working_directory chef_server_webui_working_dir  
65 - worker_processes node['chef_server']['chef-server-webui']['worker_processes'] 63 + worker_timeout node['gitlab']['gitlab-core']['worker_timeout']
  64 + working_directory gitlab_core_working_dir
  65 + worker_processes node['gitlab']['gitlab-core']['worker_processes']
66 owner "root" 66 owner "root"
67 group "root" 67 group "root"
68 mode "0644" 68 mode "0644"
69 - notifies :restart, 'service[chef-server-webui]' if should_notify 69 + notifies :restart, 'service[gitlab-core]' if should_notify
70 end 70 end
71 71
72 -link "/opt/chef-server/embedded/service/chef-server-webui/tmp" do  
73 - to chef_server_webui_tmp_dir 72 +link "/opt/gitlab/embedded/service/gitlab-core/tmp" do
  73 + to gitlab_core_tmp_dir
74 end 74 end
75 75
76 -execute "chown -R #{node['chef_server']['user']['username']} /opt/chef-server/embedded/service/chef-server-webui/public" 76 +execute "chown -R #{node['gitlab']['user']['username']} /opt/gitlab/embedded/service/gitlab-core/public"
77 77
78 -runit_service "chef-server-webui" do  
79 - down node['chef_server']['chef-server-webui']['ha'] 78 +runit_service "gitlab-core" do
  79 + down node['gitlab']['gitlab-core']['ha']
80 options({ 80 options({
81 - :log_directory => chef_server_webui_log_dir 81 + :log_directory => gitlab_core_log_dir
82 }.merge(params)) 82 }.merge(params))
83 end 83 end
84 84
85 -if node['chef_server']['bootstrap']['enable']  
86 - execute "/opt/chef-server/bin/chef-server-ctl start chef-server-webui" do 85 +if node['gitlab']['bootstrap']['enable']
  86 + execute "/opt/gitlab/bin/gitlab-ctl start gitlab-core" do
87 retries 20 87 retries 20
88 end 88 end
89 end 89 end