From b5e0182d0aa07ec2bc0228d787bd7f73d206730a Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 11 Feb 2014 14:11:14 +0100 Subject: [PATCH] Make sure db:schema:load goes before db:migrate --- files/gitlab-cookbooks/gitlab/recipes/default.rb | 2 +- files/gitlab-cookbooks/gitlab/recipes/postgresql.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/recipes/default.rb b/files/gitlab-cookbooks/gitlab/recipes/default.rb index d6f82ef..c30c189 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/default.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/default.rb @@ -60,8 +60,8 @@ include_recipe "runit" # Configure Services [ - "postgresql", "redis", + "postgresql", # Postgresql depends on Redis because of `rake db:seed_fu` "unicorn", "bootstrap", ].each do |service| diff --git a/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb b/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb index 6e007a3..a753e46 100644 --- a/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb +++ b/files/gitlab-cookbooks/gitlab/recipes/postgresql.rb @@ -153,5 +153,5 @@ execute "create #{db_name} database" do user pg_user not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) } retries 30 - notifies :run, "execute[initialize database]" + notifies :run, "execute[initialize database]", :immediately end -- libgit2 0.21.2