Download as
Browse Code »

Commit b5e0182d0aa07ec2bc0228d787bd7f73d206730a

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

Make sure db:schema:load goes before db:migrate

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/default.rb
  Diff comments   View file @b5e0182
@@ -60,8 +60,8 @@ include_recipe "runit" @@ -60,8 +60,8 @@ include_recipe "runit"
60 60
61 # Configure Services 61 # Configure Services
62 [ 62 [
63 - "postgresql",  
64 "redis", 63 "redis",
  64 + "postgresql", # Postgresql depends on Redis because of `rake db:seed_fu`
65 "unicorn", 65 "unicorn",
66 "bootstrap", 66 "bootstrap",
67 ].each do |service| 67 ].each do |service|
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
  Diff comments   View file @b5e0182
@@ -153,5 +153,5 @@ execute "create #{db_name} database" do @@ -153,5 +153,5 @@ execute "create #{db_name} database" do
153 user pg_user 153 user pg_user
154 not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) } 154 not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) }
155 retries 30 155 retries 30
156 - notifies :run, "execute[initialize database]" 156 + notifies :run, "execute[initialize database]", :immediately
157 end 157 end