From 599d1847bb2211bce8282317142bbdd0a9301ad1 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 28 Jan 2014 17:33:55 +0100 Subject: [PATCH] Adapt chef-server-ctl to GitLab --- config/software/gitlab-ctl.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/config/software/gitlab-ctl.rb b/config/software/gitlab-ctl.rb index ff07548..9d68eab 100644 --- a/config/software/gitlab-ctl.rb +++ b/config/software/gitlab-ctl.rb @@ -15,16 +15,14 @@ # limitations under the License. # -name "chef-server-ctl" +name "gitlab-ctl" dependency "rsync" dependency "omnibus-ctl" -source :path => File.expand_path("files/chef-server-ctl-commands", Omnibus.project_root) - build do block do - open("#{install_dir}/bin/chef-server-ctl", "w") do |file| + open("#{install_dir}/bin/gitlab-ctl", "w") do |file| file.print <<-EOH #!/bin/bash # @@ -45,7 +43,7 @@ build do # # Ensure the calling environment (disapproval look Bundler) does not infect our -# Ruby environment if chef-server-ctl is called from a Ruby script. +# Ruby environment if gitlab-ctl is called from a Ruby script. for ruby_env_var in RUBYOPT \\ BUNDLE_BIN_PATH \\ BUNDLE_GEMFILE \\ @@ -55,12 +53,12 @@ do unset $ruby_env_var done -#{install_dir}/embedded/bin/omnibus-ctl chef-server #{install_dir}/embedded/service/omnibus-ctl $@ +#{install_dir}/embedded/bin/omnibus-ctl gitlab #{install_dir}/embedded/service/omnibus-ctl $@ EOH end end - command "chmod 755 #{install_dir}/bin/chef-server-ctl" + command "chmod 755 #{install_dir}/bin/gitlab-ctl" # additional omnibus-ctl commands command "#{install_dir}/embedded/bin/rsync -a ./ #{install_dir}/embedded/service/omnibus-ctl/" -- libgit2 0.21.2