Download as
Browse Code »

Commit c3288e9c16a89dfedd734d41f505a53146187bf2

Authored by Luciano Prestes
1 parent 413d098a
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

Fix bug to create gitlab token 

Move code of create-admin-token-colab to after code of colab-admin migrate
Use a lambda to run comand that takes the private token

Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing 1 changed file with 12 additions and 10 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @c3288e9
@@ -62,13 +62,6 @@ template &#39;/tmp/admin-gitlab.json&#39; do @@ -62,13 +62,6 @@ template &#39;/tmp/admin-gitlab.json&#39; do
62 ) 62 )
63 end 63 end
64 64
65 -execute 'create-admin-token-colab' do  
66 - command "colab-admin loaddata admin-gitlab.json"  
67 -  
68 - cwd '/tmp'  
69 - user 'root'  
70 -end  
71 -  
72 execute 'create-admin-token-gitlab' do 65 execute 'create-admin-token-gitlab' do
73 user = "admin-gitlab" 66 user = "admin-gitlab"
74 email = "admin-gitlab@example.com" 67 email = "admin-gitlab@example.com"
@@ -76,11 +69,13 @@ execute &#39;create-admin-token-gitlab&#39; do @@ -76,11 +69,13 @@ execute &#39;create-admin-token-gitlab&#39; do
76 69
77 command "RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{user}\', username: \'#{user}\', email: \'#{email}\', password: \'#{password}\', admin: \'true\')\"" 70 command "RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{user}\', username: \'#{user}\', email: \'#{email}\', password: \'#{password}\', admin: \'true\')\""
78 71
79 - user_exist = Dir.chdir '/usr/lib/gitlab' do  
80 - `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@example.com\').nil?\"`.strip 72 + user_exist = lambda do
  73 + Dir.chdir '/usr/lib/gitlab' do
  74 + `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@example.com\').nil?\"`.strip
  75 + end
81 end 76 end
82 77
83 - not_if {user_exist == "false"} 78 + not_if {user_exist.call == "false"}
84 79
85 cwd '/usr/lib/gitlab' 80 cwd '/usr/lib/gitlab'
86 user 'git' 81 user 'git'
@@ -143,3 +138,10 @@ service &#39;colab&#39; do @@ -143,3 +138,10 @@ service &#39;colab&#39; do
143 action [:enable, :start] 138 action [:enable, :start]
144 supports :restart => true 139 supports :restart => true
145 end 140 end
  141 +
  142 +execute 'create-admin-token-colab' do
  143 + command "colab-admin loaddata admin-gitlab.json"
  144 +
  145 + cwd '/tmp'
  146 + user 'root'
  147 +end