Download as
Browse Code »

Commit da5a1635511c7980c323b9431f02bb56f62f1e4b

Authored by Jacob Vosmaer
1 parent c912e449
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

Delete things we will not need - I think

Showing 2 changed files with 0 additions and 165 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @da5a163
@@ -35,112 +35,6 @@ default['chef_server']['user']['shell'] = "/bin/sh" @@ -35,112 +35,6 @@ default['chef_server']['user']['shell'] = "/bin/sh"
35 default['chef_server']['user']['home'] = "/opt/chef-server/embedded" 35 default['chef_server']['user']['home'] = "/opt/chef-server/embedded"
36 36
37 #### 37 ####
38 -# RabbitMQ  
39 -####  
40 -default['chef_server']['rabbitmq']['enable'] = true  
41 -default['chef_server']['rabbitmq']['ha'] = false  
42 -default['chef_server']['rabbitmq']['dir'] = "/var/opt/chef-server/rabbitmq"  
43 -default['chef_server']['rabbitmq']['data_dir'] = "/var/opt/chef-server/rabbitmq/db"  
44 -default['chef_server']['rabbitmq']['log_directory'] = "/var/log/chef-server/rabbitmq"  
45 -default['chef_server']['rabbitmq']['vhost'] = '/chef'  
46 -default['chef_server']['rabbitmq']['user'] = 'chef'  
47 -default['chef_server']['rabbitmq']['password'] = 'chefrocks'  
48 -default['chef_server']['rabbitmq']['node_ip_address'] = '127.0.0.1'  
49 -default['chef_server']['rabbitmq']['node_port'] = '8672'  
50 -default['chef_server']['rabbitmq']['nodename'] = 'rabbit@localhost'  
51 -default['chef_server']['rabbitmq']['vip'] = '127.0.0.1'  
52 -default['chef_server']['rabbitmq']['consumer_id'] = 'hotsauce'  
53 -  
54 -####  
55 -# Chef Solr  
56 -####  
57 -default['chef_server']['chef-solr']['enable'] = true  
58 -default['chef_server']['chef-solr']['ha'] = false  
59 -default['chef_server']['chef-solr']['dir'] = "/var/opt/chef-server/chef-solr"  
60 -default['chef_server']['chef-solr']['data_dir'] = "/var/opt/chef-server/chef-solr/data"  
61 -default['chef_server']['chef-solr']['log_directory'] = "/var/log/chef-server/chef-solr"  
62 -# defaults for heap size and new generation size are computed in the chef-solr  
63 -# recipe based on node memory  
64 -default['chef_server']['chef-solr']['heap_size'] = nil  
65 -default['chef_server']['chef-solr']['new_size'] = nil  
66 -default['chef_server']['chef-solr']['java_opts'] = ""  
67 -default['chef_server']['chef-solr']['ip_address'] = '127.0.0.1'  
68 -default['chef_server']['chef-solr']['vip'] = '127.0.0.1'  
69 -default['chef_server']['chef-solr']['port'] = 8983  
70 -default['chef_server']['chef-solr']['ram_buffer_size'] = 200  
71 -default['chef_server']['chef-solr']['merge_factor'] = 100  
72 -default['chef_server']['chef-solr']['max_merge_docs'] = 2147483647  
73 -default['chef_server']['chef-solr']['max_field_length'] = 100000  
74 -default['chef_server']['chef-solr']['max_commit_docs'] = 1000  
75 -default['chef_server']['chef-solr']['commit_interval'] = 60000 # in ms  
76 -default['chef_server']['chef-solr']['poll_seconds'] = 20 # slave -> master poll interval in seconds, max of 60 (see solrconfig.xml.erb)  
77 -  
78 -####  
79 -# Chef Expander  
80 -####  
81 -default['chef_server']['chef-expander']['enable'] = true  
82 -default['chef_server']['chef-expander']['ha'] = false  
83 -default['chef_server']['chef-expander']['dir'] = "/var/opt/chef-server/chef-expander"  
84 -default['chef_server']['chef-expander']['log_directory'] = "/var/log/chef-server/chef-expander"  
85 -default['chef_server']['chef-expander']['reindexer_log_directory'] = "/var/log/chef-server/chef-expander-reindexer"  
86 -default['chef_server']['chef-expander']['consumer_id'] = "default"  
87 -default['chef_server']['chef-expander']['nodes'] = 2  
88 -  
89 -####  
90 -# Bookshelf  
91 -####  
92 -default['chef_server']['bookshelf']['enable'] = true  
93 -default['chef_server']['bookshelf']['ha'] = false  
94 -default['chef_server']['bookshelf']['dir'] = "/var/opt/chef-server/bookshelf"  
95 -default['chef_server']['bookshelf']['data_dir'] = "/var/opt/chef-server/bookshelf/data"  
96 -default['chef_server']['bookshelf']['log_directory'] = "/var/log/chef-server/bookshelf"  
97 -default['chef_server']['bookshelf']['svlogd_size'] = 1000000  
98 -default['chef_server']['bookshelf']['svlogd_num'] = 10  
99 -default['chef_server']['bookshelf']['vip'] = node['fqdn']  
100 -default['chef_server']['bookshelf']['url'] = "https://#{node['fqdn']}"  
101 -# Default: set to Host: header. Override to hardcode a url, "http://..."  
102 -default['chef_server']['bookshelf']['external_url'] = :host_header  
103 -default['chef_server']['bookshelf']['listen'] = '127.0.0.1'  
104 -default['chef_server']['bookshelf']['port'] = 4321  
105 -default['chef_server']['bookshelf']['stream_download'] = true  
106 -default['chef_server']['bookshelf']['access_key_id'] = "generated-by-default"  
107 -default['chef_server']['bookshelf']['secret_access_key'] = "generated-by-default"  
108 -  
109 -####  
110 -# Erlang Chef Server API  
111 -####  
112 -default['chef_server']['erchef']['enable'] = true  
113 -default['chef_server']['erchef']['ha'] = false  
114 -default['chef_server']['erchef']['dir'] = "/var/opt/chef-server/erchef"  
115 -default['chef_server']['erchef']['log_directory'] = "/var/log/chef-server/erchef"  
116 -default['chef_server']['erchef']['svlogd_size'] = 1000000  
117 -default['chef_server']['erchef']['svlogd_num'] = 10  
118 -default['chef_server']['erchef']['vip'] = '127.0.0.1'  
119 -default['chef_server']['erchef']['listen'] = '127.0.0.1'  
120 -default['chef_server']['erchef']['port'] = 8000  
121 -default['chef_server']['erchef']['auth_skew'] = '900'  
122 -default['chef_server']['erchef']['bulk_fetch_batch_size'] = '5'  
123 -default['chef_server']['erchef']['max_cache_size'] = '10000'  
124 -default['chef_server']['erchef']['cache_ttl'] = '3600'  
125 -default['chef_server']['erchef']['db_pool_size'] = '20'  
126 -default['chef_server']['erchef']['ibrowse_max_sessions'] = 256  
127 -default['chef_server']['erchef']['ibrowse_max_pipeline_size'] = 1  
128 -# Default: generate signed URLs based upon Host: header. Override with a url, "http:// ..."  
129 -default['chef_server']['erchef']['base_resource_url'] = :host_header  
130 -default['chef_server']['erchef']['s3_bucket'] = 'bookshelf'  
131 -default['chef_server']['erchef']['s3_url_ttl'] = 900  
132 -default['chef_server']['erchef']['s3_parallel_ops_timeout'] = 5000  
133 -default['chef_server']['erchef']['s3_parallel_ops_fanout'] = 20  
134 -default['chef_server']['erchef']['proxy_user'] = "pivotal"  
135 -default['chef_server']['erchef']['validation_client_name'] = "chef-validator"  
136 -default['chef_server']['erchef']['umask'] = "0022"  
137 -default['chef_server']['erchef']['web_ui_client_name'] = "chef-webui"  
138 -default['chef_server']['erchef']['root_metric_key'] = "chefAPI"  
139 -default['chef_server']['erchef']['depsolver_worker_count'] = 5  
140 -default['chef_server']['erchef']['depsolver_timeout'] = 5000  
141 -default['chef_server']['erchef']['max_request_size'] = 1000000  
142 -  
143 -####  
144 # Chef Server WebUI 38 # Chef Server WebUI
145 #### 39 ####
146 default['chef_server']['chef-server-webui']['enable'] = true 40 default['chef_server']['chef-server-webui']['enable'] = true
@@ -163,22 +57,6 @@ default['chef_server']['chef-server-webui']['web_ui_client_name'] = "chef-webui" @@ -163,22 +57,6 @@ default['chef_server']['chef-server-webui']['web_ui_client_name'] = "chef-webui"
163 default['chef_server']['chef-server-webui']['web_ui_admin_user_name'] = "admin" 57 default['chef_server']['chef-server-webui']['web_ui_admin_user_name'] = "admin"
164 default['chef_server']['chef-server-webui']['web_ui_admin_default_password'] = "p@ssw0rd1" 58 default['chef_server']['chef-server-webui']['web_ui_admin_default_password'] = "p@ssw0rd1"
165 59
166 -####  
167 -# Chef Pedant  
168 -####  
169 -default['chef_server']['chef-pedant']['dir'] = "/var/opt/chef-server/chef-pedant"  
170 -default['chef_server']['chef-pedant']['log_directory'] = "/var/log/chef-server/chef-pedant"  
171 -default['chef_server']['chef-pedant']['log_http_requests'] = true  
172 -  
173 -###  
174 -# Estatsd  
175 -###  
176 -default['chef_server']['estatsd']['enable'] = true  
177 -default['chef_server']['estatsd']['dir'] = "/var/opt/chef-server/estatsd"  
178 -default['chef_server']['estatsd']['log_directory'] = "/var/log/chef-server/estatsd"  
179 -default['chef_server']['estatsd']['vip'] = "127.0.0.1"  
180 -default['chef_server']['estatsd']['port'] = 9466  
181 -  
182 ### 60 ###
183 # Load Balancer 61 # Load Balancer
184 ### 62 ###
files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
  Diff comments   View file @da5a163
@@ -24,17 +24,11 @@ require 'securerandom' @@ -24,17 +24,11 @@ require 'securerandom'
24 module ChefServer 24 module ChefServer
25 extend(Mixlib::Config) 25 extend(Mixlib::Config)
26 26
27 - rabbitmq Mash.new  
28 - chef_solr Mash.new  
29 - chef_expander Mash.new  
30 - erchef Mash.new  
31 chef_server_webui Mash.new 27 chef_server_webui Mash.new
32 lb Mash.new 28 lb Mash.new
33 postgresql Mash.new 29 postgresql Mash.new
34 - bookshelf Mash.new  
35 bootstrap Mash.new 30 bootstrap Mash.new
36 nginx Mash.new 31 nginx Mash.new
37 - api_fqdn nil  
38 node nil 32 node nil
39 notification_email nil 33 notification_email nil
40 34
@@ -56,20 +50,14 @@ module ChefServer @@ -56,20 +50,14 @@ module ChefServer
56 end 50 end
57 end 51 end
58 52
59 - ChefServer['rabbitmq']['password'] ||= generate_hex(50)  
60 ChefServer['chef_server_webui']['cookie_secret'] ||= generate_hex(50) 53 ChefServer['chef_server_webui']['cookie_secret'] ||= generate_hex(50)
61 ChefServer['postgresql']['sql_password'] ||= generate_hex(50) 54 ChefServer['postgresql']['sql_password'] ||= generate_hex(50)
62 ChefServer['postgresql']['sql_ro_password'] ||= generate_hex(50) 55 ChefServer['postgresql']['sql_ro_password'] ||= generate_hex(50)
63 - ChefServer['bookshelf']['access_key_id'] ||= generate_hex(20)  
64 - ChefServer['bookshelf']['secret_access_key'] ||= generate_hex(40)  
65 56
66 if File.directory?("/etc/chef-server") 57 if File.directory?("/etc/chef-server")
67 File.open("/etc/chef-server/chef-server-secrets.json", "w") do |f| 58 File.open("/etc/chef-server/chef-server-secrets.json", "w") do |f|
68 f.puts( 59 f.puts(
69 Chef::JSONCompat.to_json_pretty({ 60 Chef::JSONCompat.to_json_pretty({
70 - 'rabbitmq' => {  
71 - 'password' => ChefServer['rabbitmq']['password'],  
72 - },  
73 'chef_server_webui' => { 61 'chef_server_webui' => {
74 'cookie_secret' => ChefServer['chef_server_webui']['cookie_secret'], 62 'cookie_secret' => ChefServer['chef_server_webui']['cookie_secret'],
75 }, 63 },
@@ -77,10 +65,6 @@ module ChefServer @@ -77,10 +65,6 @@ module ChefServer
77 'sql_password' => ChefServer['postgresql']['sql_password'], 65 'sql_password' => ChefServer['postgresql']['sql_password'],
78 'sql_ro_password' => ChefServer['postgresql']['sql_ro_password'] 66 'sql_ro_password' => ChefServer['postgresql']['sql_ro_password']
79 }, 67 },
80 - 'bookshelf' => {  
81 - 'access_key_id' => ChefServer['bookshelf']['access_key_id'],  
82 - 'secret_access_key' => ChefServer['bookshelf']['secret_access_key']  
83 - }  
84 }) 68 })
85 ) 69 )
86 system("chmod 0600 /etc/chef-server/chef-server-secrets.json") 70 system("chmod 0600 /etc/chef-server/chef-server-secrets.json")
@@ -91,15 +75,10 @@ module ChefServer @@ -91,15 +75,10 @@ module ChefServer
91 def generate_hash 75 def generate_hash
92 results = { "chef_server" => {} } 76 results = { "chef_server" => {} }
93 [ 77 [
94 - "rabbitmq",  
95 - "chef_solr",  
96 - "chef_expander",  
97 - "erchef",  
98 "chef_server_webui", 78 "chef_server_webui",
99 "lb", 79 "lb",
100 "postgresql", 80 "postgresql",
101 "nginx", 81 "nginx",
102 - "bookshelf",  
103 "bootstrap" 82 "bootstrap"
104 ].each do |key| 83 ].each do |key|
105 rkey = key.gsub('_', '-') 84 rkey = key.gsub('_', '-')
@@ -110,30 +89,8 @@ module ChefServer @@ -110,30 +89,8 @@ module ChefServer
110 results 89 results
111 end 90 end
112 91
113 - def gen_api_fqdn  
114 - ChefServer["lb"]["api_fqdn"] ||= ChefServer['api_fqdn']  
115 - ChefServer["lb"]["web_ui_fqdn"] ||= ChefServer['api_fqdn']  
116 - ChefServer["nginx"]["server_name"] ||= ChefServer['api_fqdn']  
117 -  
118 - # If the user manually set an Nginx URL in the config file all bets are  
119 - # off...we just cross our fingers and hope they constructed the URL  
120 - # correctly! We may want to remove this 'private' config value from the  
121 - # documenation.  
122 - if ChefServer["nginx"]["url"].nil?  
123 - ChefServer["nginx"]["url"] = "https://#{ChefServer['api_fqdn']}"  
124 - if ChefServer["nginx"]["ssl_port"]  
125 - ChefServer["nginx"]["url"] << ":#{ChefServer["nginx"]["ssl_port"]}"  
126 - end  
127 - end  
128 -  
129 - # The external bookshelf URL should match the external lb  
130 - ChefServer["bookshelf"]["url"] ||= ChefServer["nginx"]["url"]  
131 - end  
132 -  
133 def generate_config(node_name) 92 def generate_config(node_name)
134 generate_secrets(node_name) 93 generate_secrets(node_name)
135 - ChefServer[:api_fqdn] ||= node_name  
136 - gen_api_fqdn  
137 generate_hash 94 generate_hash
138 end 95 end
139 end 96 end