Download as
Browse Code »

Commit 599d1847bb2211bce8282317142bbdd0a9301ad1

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

Adapt chef-server-ctl to GitLab

Showing 1 changed file with 5 additions and 7 deletions   Show diff stats
config/software/gitlab-ctl.rb
  Diff comments   View file @599d184
@@ -15,16 +15,14 @@ @@ -15,16 +15,14 @@
15 # limitations under the License. 15 # limitations under the License.
16 # 16 #
17 17
18 -name "chef-server-ctl" 18 +name "gitlab-ctl"
19 19
20 dependency "rsync" 20 dependency "rsync"
21 dependency "omnibus-ctl" 21 dependency "omnibus-ctl"
22 22
23 -source :path => File.expand_path("files/chef-server-ctl-commands", Omnibus.project_root)  
24 -  
25 build do 23 build do
26 block do 24 block do
27 - open("#{install_dir}/bin/chef-server-ctl", "w") do |file| 25 + open("#{install_dir}/bin/gitlab-ctl", "w") do |file|
28 file.print <<-EOH 26 file.print <<-EOH
29 #!/bin/bash 27 #!/bin/bash
30 # 28 #
@@ -45,7 +43,7 @@ build do @@ -45,7 +43,7 @@ build do
45 # 43 #
46 44
47 # Ensure the calling environment (disapproval look Bundler) does not infect our 45 # Ensure the calling environment (disapproval look Bundler) does not infect our
48 -# Ruby environment if chef-server-ctl is called from a Ruby script. 46 +# Ruby environment if gitlab-ctl is called from a Ruby script.
49 for ruby_env_var in RUBYOPT \\ 47 for ruby_env_var in RUBYOPT \\
50 BUNDLE_BIN_PATH \\ 48 BUNDLE_BIN_PATH \\
51 BUNDLE_GEMFILE \\ 49 BUNDLE_GEMFILE \\
@@ -55,12 +53,12 @@ do @@ -55,12 +53,12 @@ do
55 unset $ruby_env_var 53 unset $ruby_env_var
56 done 54 done
57 55
58 -#{install_dir}/embedded/bin/omnibus-ctl chef-server #{install_dir}/embedded/service/omnibus-ctl $@ 56 +#{install_dir}/embedded/bin/omnibus-ctl gitlab #{install_dir}/embedded/service/omnibus-ctl $@
59 EOH 57 EOH
60 end 58 end
61 end 59 end
62 60
63 - command "chmod 755 #{install_dir}/bin/chef-server-ctl" 61 + command "chmod 755 #{install_dir}/bin/gitlab-ctl"
64 62
65 # additional omnibus-ctl commands 63 # additional omnibus-ctl commands
66 command "#{install_dir}/embedded/bin/rsync -a ./ #{install_dir}/embedded/service/omnibus-ctl/" 64 command "#{install_dir}/embedded/bin/rsync -a ./ #{install_dir}/embedded/service/omnibus-ctl/"