Download as
Browse Code »

Commit e85beced845a95f7bab68f08f802239bfdcd2b33

Authored by Luciano Prestes
1 parent 1cf7f36a
Exists in master and in 66 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Change order of recipes for execute gitlab before colab into integration_server 

Signed-off-by: Lucas Moura  <lucas.moura128@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @e85bece
... ... @@ -53,7 +53,7 @@ template &#39;/etc/colab/settings.d/00-database.yaml&#39; do
53 53 notifies :restart, 'service[colab]'
54 54 end
55 55  
56   -execute 'create token-admin' do
  56 +execute 'create-admin-token-colab' do
57 57 user = "admin-gitlab"
58 58 email = "admin-gitlab@admin.com"
59 59 password = SecureRandom.random_number.to_s
... ... @@ -61,15 +61,15 @@ execute &#39;create token-admin&#39; do
61 61 command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell"
62 62 end
63 63  
64   -execute 'admin-token' do
  64 +execute 'create-admin-token-gitlab' do
65 65 user = "admin-gitlab"
66 66 email = "admin-gitlab@admin.com"
67 67 password = SecureRandom.random_number.to_s
68 68  
69   - command "sudo -u git RAILS_ENV=production bundle exec rails runner \"User.create(name: #{name}, username: #{name}, email: #{email}, password: #{password}, admin: true)\""
  69 + command "RAILS_ENV=production bundle exec rails runner \"User.create(name: #{name}, username: #{name}, email: #{email}, password: #{password}, admin: true)\""
70 70  
71 71 cwd '/usr/lib/gitlab'
72   - user 'root'
  72 + user 'git'
73 73 end
74 74  
75 75 template '/etc/colab/settings.d/01-apps.yaml' do
... ...
roles/integration_server.rb
  Diff comments   View file @e85bece
... ... @@ -8,8 +8,8 @@ run_list *[
8 8 'recipe[mailman-api]',
9 9 'recipe[mailman]',
10 10 'recipe[mailman::webui]',
  11 + 'recipe[gitlab]',
11 12 'recipe[colab]',
12 13 'recipe[colab::nginx]',
13   - 'recipe[gitlab]',
14 14 'recipe[backup]',
15 15 ]
... ...