From 0a14a69ed49fa0ec739078a69db208cde2d7abc2 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 30 Jan 2014 10:35:50 +0100
Subject: [PATCH] Remove more stuff we do not need right now

---
 files/gitlab-cookbooks/gitlab/libraries/chef_server.rb |  15 +--------------
 files/gitlab-cookbooks/gitlab/libraries/helper.rb      | 110 ++------------------------------------------------------------------------------------------------------------
 2 files changed, 3 insertions(+), 122 deletions(-)

diff --git a/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb b/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
index bef63d9..ba60083 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/chef_server.rb
@@ -24,13 +24,8 @@ require 'securerandom'
 module ChefServer
   extend(Mixlib::Config)
 
-  chef_server_webui Mash.new
-  lb Mash.new
   postgresql Mash.new
-  bootstrap Mash.new
-  nginx Mash.new
   node nil
-  notification_email nil
 
   class << self
 
@@ -58,9 +53,6 @@ module ChefServer
         File.open("/etc/chef-server/chef-server-secrets.json", "w") do |f|
           f.puts(
             Chef::JSONCompat.to_json_pretty({
-              'chef_server_webui' => {
-                'cookie_secret' => ChefServer['chef_server_webui']['cookie_secret'],
-              },
               'postgresql' => {
                 'sql_password' => ChefServer['postgresql']['sql_password'],
                 'sql_ro_password' => ChefServer['postgresql']['sql_ro_password']
@@ -75,16 +67,11 @@ module ChefServer
     def generate_hash
       results = { "chef_server" => {} }
       [
-        "chef_server_webui",
-        "lb",
-        "postgresql",
-        "nginx",
-        "bootstrap"
+        "postgresql"
       ].each do |key|
         rkey = key.gsub('_', '-')
         results['chef_server'][rkey] = ChefServer[key]
       end
-      results['chef_server']['notification_email'] = ChefServer['notification_email']
 
       results
     end
diff --git a/files/gitlab-cookbooks/gitlab/libraries/helper.rb b/files/gitlab-cookbooks/gitlab/libraries/helper.rb
index be63e11..c702aec 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/helper.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/helper.rb
@@ -76,119 +76,13 @@ end
 class OmnibusHelper
 
   def self.should_notify?(service_name)
-    File.symlink?("/opt/chef-server/service/#{service_name}") && service_up?(service_name)
+    File.symlink?("/opt/gitlab/service/#{service_name}") && service_up?(service_name)
   end
 
   def self.service_up?(service_name)
-    o = Mixlib::ShellOut.new("/opt/chef-server/bin/chef-server-ctl status #{service_name}")
+    o = Mixlib::ShellOut.new("/opt/gitlab/bin/gitlab-ctl status #{service_name}")
     o.run_command
     o.exitstatus == 0
   end
 
-  # generate a certificate signed by the opscode ca key
-  #
-  # === Returns
-  # [cert, key]
-  #
-  def self.gen_certificate
-    key = OpenSSL::PKey::RSA.generate(2048)
-    public_key = key.public_key
-    cert_uuid = UUIDTools::UUID.random_create
-    common_name = "URI:http://opscode.com/GUIDS/#{cert_uuid}"
-    info = [["C", "US"], ["ST", "Washington"], ["L", "Seattle"], ["O", "Opscode, Inc."], ["OU", "Certificate Service"], ["CN", common_name]]
-    cert = OpenSSL::X509::Certificate.new
-    cert.subject = OpenSSL::X509::Name.new(info)
-    cert.issuer = ca_certificate.subject
-    cert.not_before = Time.now
-    cert.not_after = Time.now + 10 * 365 * 24 * 60 * 60 # 10 years
-    cert.public_key = public_key
-    cert.serial = 1
-    cert.version = 3
-
-    ef = OpenSSL::X509::ExtensionFactory.new
-    ef.subject_certificate = cert
-    ef.issuer_certificate = ca_certificate
-    cert.extensions = [
-                       ef.create_extension("basicConstraints","CA:FALSE",true),
-                       ef.create_extension("subjectKeyIdentifier", "hash")
-                      ]
-    cert.sign(ca_keypair, OpenSSL::Digest::SHA1.new)
-
-    return cert, key
-  end
-
-  ######################################################################
-  #
-  # the following is the Opscode CA key and certificate, copied from
-  # the cert project(s)
-  #
-  ######################################################################
-
-  def self.ca_certificate
-    @_ca_cert ||=
-      begin
-        cert_string = <<-EOCERT
------BEGIN CERTIFICATE-----
-MIIDyDCCAzGgAwIBAwIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx
-EzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM
-DU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw
-BgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t
-MB4XDTA5MDUwNjIzMDEzNVoXDTE5MDUwNDIzMDEzNVowgZ4xCzAJBgNVBAYTAlVT
-MRMwEQYDVQQIDApXYXNoaW5ndG9uMRAwDgYDVQQHDAdTZWF0dGxlMRYwFAYDVQQK
-DA1PcHNjb2RlLCBJbmMuMRwwGgYDVQQLDBNDZXJ0aWZpY2F0ZSBTZXJ2aWNlMTIw
-MAYDVQQDDClvcHNjb2RlLmNvbS9lbWFpbEFkZHJlc3M9YXV0aEBvcHNjb2RlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAlKTCZPmifZe9ruxlQpWRj+yx
-Mxt6+omH44jSfj4Obrnmm5eqVhRwjSfHOq383IeilFrNqC5VkiZrlLh8uhuTeaCy
-PE1eED7DZOmwuswTui49DqXiVE39jB6TnzZ3mr6HOPHXtPhSzdtILo18RMmgyfm/
-csrwct1B3GuQ9LSVMXkCAwEAAaOCARIwggEOMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFJ228MdlU86GfVLsQx8rleAeM+eLMA4GA1UdDwEB/wQEAwIBBjCBywYD
-VR0jBIHDMIHAgBSdtvDHZVPOhn1S7EMfK5XgHjPni6GBpKSBoTCBnjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAU
-BgNVBAoMDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZp
-Y2UxMjAwBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2Nv
-ZGUuY29tggEBMA0GCSqGSIb3DQEBBQUAA4GBAHJxAnwTt/liAMfZf5Khg7Mck4f+
-IkO3rjoI23XNbVHlctTOieSwzRZtBRdNOTzQvzzhh1KKpl3Rt04rrRPQvDeO/Usm
-pVr6g+lk2hhDgKKeR4J7qXZmlemZTrFZoobdoijDaOT5NuqkGt5ANdTqzRwbC9zQ
-t6vXSWGCFoo4AEic
------END CERTIFICATE-----
-EOCERT
-        OpenSSL::X509::Certificate.new(cert_string)
-      end
-  end
-
-  def self.ca_keypair
-    @_ca_key ||=
-      begin
-        keypair_string = <<-EOKEY
------BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCUpMJk+aJ9l72u7GVClZGP7LEzG3r6iYfjiNJ+Pg5uueabl6pW
-FHCNJ8c6rfzch6KUWs2oLlWSJmuUuHy6G5N5oLI8TV4QPsNk6bC6zBO6Lj0OpeJU
-Tf2MHpOfNneavoc48de0+FLN20gujXxEyaDJ+b9yyvBy3UHca5D0tJUxeQIDAQAB
-AoGAYAPRIeJyiIfk2cIPYqQ0g3BTwfyFQqJl6Z7uwOca8YEZqfWc7L+FOFiyg3/x
-rw3aAdRptbJASgiRQ16sCpdXeaRFY5gcO2MnqmCyoyp2//zhdFReSC+Akim1UPtG
-5SqqdV9I0TBl+1JlMiivn677mXGij+qyQjSWxW2pGVsbTSUCQQDDLb/DgoD0+N6O
-FIoJ/Mh5cgIxQhqXu/dylEv/I3goSJdXPAqhsnsa6zYQGdftnvMK1ZXS/hYL4i06
-w9lKDV8PAkEAwvaz1oUtXLNfYYAF42c1BoBhqCzjXSzMWPu5BlWQzSsdzgVgDuX3
-LlkiIdRtMcMaNskaBTtIClCxaEm3rUnm9wJAEOp2JEu7QYAQSeAd1p/CAESRTBOe
-mmgAGj4gGAzK7TLdawIZKcp+QOcB2INk44NTLS01vwOmhYEkymMPAgwGoQJAKimq
-GMFyXvLXtME4BMbEG+TVucYDYZoXk0LU776/cu9ZIb3d2Tr4asiR7hj/iFx2JdT1
-0J3SZZCv3SrcExjBXwJABS3/iQroe24tvrmyy4tc5YG5ygIRaBUCs6dn0fbisX/9
-K1oq5Lnwimy4l2NI0o/lxIqnwFilACjs3tuXH1OhMA==
------END RSA PRIVATE KEY-----
-EOKEY
-        OpenSSL::PKey::RSA.new(keypair_string)
-      end
-  end
-
-  def self.erl_atom_or_string(term)
-    case term
-    when Symbol
-      term
-    when String
-      "\"#{term}\""
-    else
-      "undefined"
-    end
-  end
 end
-
--
libgit2 0.21.2