Download as
Browse Code »

Commit 1084c047e3a7ed0a6b5ec1b26863e6f34b640229

Authored by Jacob Vosmaer
1 parent 69fe1222
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 unneeded chef-server migration code 

The vendored runit recipe of omnibus-chef-serfer includes one-time
migration code for installations that have a `opscode-runsvdir` service.
Due to unintelligent search-and-replace editing of yours truly, we not
only kept migration code we do not need (because there exist no previous
installations of omnibus-gitlab) but we were also triggering the cleanup
on files/services that should not be cleaned up. This commit removes the
migration code.
Showing 1 changed file with 0 additions and 9 deletions   Show diff stats
files/gitlab-cookbooks/runit/recipes/upstart.rb
  Diff comments   View file @1084c04
@@ -17,15 +17,6 @@ @@ -17,15 +17,6 @@
17 # limitations under the License. 17 # limitations under the License.
18 # 18 #
19 19
20 -# Ensure the previous named iteration of the system job is nuked  
21 -execute "initctl stop gitlab-runsvdir" do  
22 - only_if "initctl status gitlab-runsvdir | grep start"  
23 - retries 30  
24 -end  
25 -file "/etc/init/gitlab-runsvdir.conf" do  
26 - action :delete  
27 -end  
28 -  
29 cookbook_file "/etc/init/gitlab-runsvdir.conf" do 20 cookbook_file "/etc/init/gitlab-runsvdir.conf" do
30 owner "root" 21 owner "root"
31 group "root" 22 group "root"