Download as
Browse Code »

Commit 0a14a69ed49fa0ec739078a69db208cde2d7abc2

Authored by Jacob Vosmaer
1 parent 508d4866
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 more stuff we do not need right now

Showing 2 changed files with 3 additions and 122 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
  Diff comments   View file @0a14a69
... ... @@ -24,13 +24,8 @@ require 'securerandom'
24 24 module ChefServer
25 25 extend(Mixlib::Config)
26 26  
27   - chef_server_webui Mash.new
28   - lb Mash.new
29 27 postgresql Mash.new
30   - bootstrap Mash.new
31   - nginx Mash.new
32 28 node nil
33   - notification_email nil
34 29  
35 30 class << self
36 31  
... ... @@ -58,9 +53,6 @@ module ChefServer
58 53 File.open("/etc/chef-server/chef-server-secrets.json", "w") do |f|
59 54 f.puts(
60 55 Chef::JSONCompat.to_json_pretty({
61   - 'chef_server_webui' => {
62   - 'cookie_secret' => ChefServer['chef_server_webui']['cookie_secret'],
63   - },
64 56 'postgresql' => {
65 57 'sql_password' => ChefServer['postgresql']['sql_password'],
66 58 'sql_ro_password' => ChefServer['postgresql']['sql_ro_password']
... ... @@ -75,16 +67,11 @@ module ChefServer
75 67 def generate_hash
76 68 results = { "chef_server" => {} }
77 69 [
78   - "chef_server_webui",
79   - "lb",
80   - "postgresql",
81   - "nginx",
82   - "bootstrap"
  70 + "postgresql"
83 71 ].each do |key|
84 72 rkey = key.gsub('_', '-')
85 73 results['chef_server'][rkey] = ChefServer[key]
86 74 end
87   - results['chef_server']['notification_email'] = ChefServer['notification_email']
88 75  
89 76 results
90 77 end
... ...
files/gitlab-cookbooks/gitlab/libraries/helper.rb
  Diff comments   View file @0a14a69
... ... @@ -76,119 +76,13 @@ end
76 76 class OmnibusHelper
77 77  
78 78 def self.should_notify?(service_name)
79   - File.symlink?("/opt/chef-server/service/#{service_name}") && service_up?(service_name)
  79 + File.symlink?("/opt/gitlab/service/#{service_name}") && service_up?(service_name)
80 80 end
81 81  
82 82 def self.service_up?(service_name)
83   - o = Mixlib::ShellOut.new("/opt/chef-server/bin/chef-server-ctl status #{service_name}")
  83 + o = Mixlib::ShellOut.new("/opt/gitlab/bin/gitlab-ctl status #{service_name}")
84 84 o.run_command
85 85 o.exitstatus == 0
86 86 end
87 87  
88   - # generate a certificate signed by the opscode ca key
89   - #
90   - # === Returns
91   - # [cert, key]
92   - #
93   - def self.gen_certificate
94   - key = OpenSSL::PKey::RSA.generate(2048)
95   - public_key = key.public_key
96   - cert_uuid = UUIDTools::UUID.random_create
97   - common_name = "URI:http://opscode.com/GUIDS/#{cert_uuid}"
98   - info = [["C", "US"], ["ST", "Washington"], ["L", "Seattle"], ["O", "Opscode, Inc."], ["OU", "Certificate Service"], ["CN", common_name]]
99   - cert = OpenSSL::X509::Certificate.new
100   - cert.subject = OpenSSL::X509::Name.new(info)
101   - cert.issuer = ca_certificate.subject
102   - cert.not_before = Time.now
103   - cert.not_after = Time.now + 10 * 365 * 24 * 60 * 60 # 10 years
104   - cert.public_key = public_key
105   - cert.serial = 1
106   - cert.version = 3
107   -
108   - ef = OpenSSL::X509::ExtensionFactory.new
109   - ef.subject_certificate = cert
110   - ef.issuer_certificate = ca_certificate
111   - cert.extensions = [
112   - ef.create_extension("basicConstraints","CA:FALSE",true),
113   - ef.create_extension("subjectKeyIdentifier", "hash")
114   - ]
115   - cert.sign(ca_keypair, OpenSSL::Digest::SHA1.new)
116   -
117   - return cert, key
118   - end
119   -
120   - ######################################################################
121   - #
122   - # the following is the Opscode CA key and certificate, copied from
123   - # the cert project(s)
124   - #
125   - ######################################################################
126   -
127   - def self.ca_certificate
128   - @_ca_cert ||=
129   - begin
130   - cert_string = <<-EOCERT
131   ------BEGIN CERTIFICATE-----
132   -MIIDyDCCAzGgAwIBAwIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx
133   -EzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM
134   -DU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw
135   -BgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t
136   -MB4XDTA5MDUwNjIzMDEzNVoXDTE5MDUwNDIzMDEzNVowgZ4xCzAJBgNVBAYTAlVT
137   -MRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQHDAdTZWF0dGxlMRYwFAYDVQQK
138   -DA1PcHNjb2RlLCBJbmMuMRwwGgYDVQQLDBNDZXJ0aWZpY2F0ZSBTZXJ2aWNlMTIw
139   -MAYDVQQDDClvcHNjb2RlLmNvbS9lbWFpbEFkZHJlc3M9YXV0aEBvcHNjb2RlLmNv
140   -bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAlKTCZPmifZe9ruxlQpWRj+yx
141   -Mxt6+omH44jSfj4Obrnmm5eqVhRwjSfHOq383IeilFrNqC5VkiZrlLh8uhuTeaCy
142   -PE1eED7DZOmwuswTui49DqXiVE39jB6TnzZ3mr6HOPHXtPhSzdtILo18RMmgyfm/
143   -csrwct1B3GuQ9LSVMXkCAwEAAaOCARIwggEOMA8GA1UdEwEB/wQFMAMBAf8wHQYD
144   -VR0OBBYEFJ228MdlU86GfVLsQx8rleAeM+eLMA4GA1UdDwEB/wQEAwIBBjCBywYD
145   -VR0jBIHDMIHAgBSdtvDHZVPOhn1S7EMfK5XgHjPni6GBpKSBoTCBnjELMAkGA1UE
146   -BhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAU
147   -BgNVBAoMDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZp
148   -Y2UxMjAwBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2Nv
149   -ZGUuY29tggEBMA0GCSqGSIb3DQEBBQUAA4GBAHJxAnwTt/liAMfZf5Khg7Mck4f+
150   -IkO3rjoI23XNbVHlctTOieSwzRZtBRdNOTzQvzzhh1KKpl3Rt04rrRPQvDeO/Usm
151   -pVr6g+lk2hhDgKKeR4J7qXZmlemZTrFZoobdoijDaOT5NuqkGt5ANdTqzRwbC9zQ
152   -t6vXSWGCFoo4AEic
153   ------END CERTIFICATE-----
154   -EOCERT
155   - OpenSSL::X509::Certificate.new(cert_string)
156   - end
157   - end
158   -
159   - def self.ca_keypair
160   - @_ca_key ||=
161   - begin
162   - keypair_string = <<-EOKEY
163   ------BEGIN RSA PRIVATE KEY-----
164   -MIICWwIBAAKBgQCUpMJk+aJ9l72u7GVClZGP7LEzG3r6iYfjiNJ+Pg5uueabl6pW
165   -FHCNJ8c6rfzch6KUWs2oLlWSJmuUuHy6G5N5oLI8TV4QPsNk6bC6zBO6Lj0OpeJU
166   -Tf2MHpOfNneavoc48de0+FLN20gujXxEyaDJ+b9yyvBy3UHca5D0tJUxeQIDAQAB
167   -AoGAYAPRIeJyiIfk2cIPYqQ0g3BTwfyFQqJl6Z7uwOca8YEZqfWc7L+FOFiyg3/x
168   -rw3aAdRptbJASgiRQ16sCpdXeaRFY5gcO2MnqmCyoyp2//zhdFReSC+Akim1UPtG
169   -5SqqdV9I0TBl+1JlMiivn677mXGij+qyQjSWxW2pGVsbTSUCQQDDLb/DgoD0+N6O
170   -FIoJ/Mh5cgIxQhqXu/dylEv/I3goSJdXPAqhsnsa6zYQGdftnvMK1ZXS/hYL4i06
171   -w9lKDV8PAkEAwvaz1oUtXLNfYYAF42c1BoBhqCzjXSzMWPu5BlWQzSsdzgVgDuX3
172   -LlkiIdRtMcMaNskaBTtIClCxaEm3rUnm9wJAEOp2JEu7QYAQSeAd1p/CAESRTBOe
173   -mmgAGj4gGAzK7TLdawIZKcp+QOcB2INk44NTLS01vwOmhYEkymMPAgwGoQJAKimq
174   -GMFyXvLXtME4BMbEG+TVucYDYZoXk0LU776/cu9ZIb3d2Tr4asiR7hj/iFx2JdT1
175   -0J3SZZCv3SrcExjBXwJABS3/iQroe24tvrmyy4tc5YG5ygIRaBUCs6dn0fbisX/9
176   -K1oq5Lnwimy4l2NI0o/lxIqnwFilACjs3tuXH1OhMA==
177   ------END RSA PRIVATE KEY-----
178   -EOKEY
179   - OpenSSL::PKey::RSA.new(keypair_string)
180   - end
181   - end
182   -
183   - def self.erl_atom_or_string(term)
184   - case term
185   - when Symbol
186   - term
187   - when String
188   - "\"#{term}\""
189   - else
190   - "undefined"
191   - end
192   - end
193 88 end
194   -
... ...