From e85beced845a95f7bab68f08f802239bfdcd2b33 Mon Sep 17 00:00:00 2001 From: Luciano Prestes Cavalcanti Date: Tue, 9 Jun 2015 13:21:40 -0300 Subject: [PATCH] Change order of recipes for execute gitlab before colab into integration_server --- cookbooks/colab/recipes/default.rb | 8 ++++---- roles/integration_server.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb index dcb1c4c..4b82f77 100644 --- a/cookbooks/colab/recipes/default.rb +++ b/cookbooks/colab/recipes/default.rb @@ -53,7 +53,7 @@ template '/etc/colab/settings.d/00-database.yaml' do notifies :restart, 'service[colab]' end -execute 'create token-admin' do +execute 'create-admin-token-colab' do user = "admin-gitlab" email = "admin-gitlab@admin.com" password = SecureRandom.random_number.to_s @@ -61,15 +61,15 @@ execute 'create token-admin' do command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell" end -execute 'admin-token' do +execute 'create-admin-token-gitlab' do user = "admin-gitlab" email = "admin-gitlab@admin.com" password = SecureRandom.random_number.to_s - command "sudo -u git RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{name}\', username: \'#{name}\', email: \'#{email}\', password: \'#{password}\', admin: \'true\')\"" + command "RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{name}\', username: \'#{name}\', email: \'#{email}\', password: \'#{password}\', admin: \'true\')\"" cwd '/usr/lib/gitlab' - user 'root' + user 'git' end template '/etc/colab/settings.d/01-apps.yaml' do diff --git a/roles/integration_server.rb b/roles/integration_server.rb index 4782e33..674ea57 100644 --- a/roles/integration_server.rb +++ b/roles/integration_server.rb @@ -8,8 +8,8 @@ run_list *[ 'recipe[mailman-api]', 'recipe[mailman]', 'recipe[mailman::webui]', + 'recipe[gitlab]', 'recipe[colab]', 'recipe[colab::nginx]', - 'recipe[gitlab]', 'recipe[backup]', ] -- libgit2 0.21.2