Download as
Browse Code »

Commit 2718f61cecee216b750d89b178b3f7d46edc8ba3

Authored by Sergio Oliveira
1 parent 040ffe46
Exists in master and in 89 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fixed user and email address

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @2718f61
@@ -71,13 +71,13 @@ end @@ -71,13 +71,13 @@ end
71 71
72 execute 'create-admin-token-gitlab' do 72 execute 'create-admin-token-gitlab' do
73 user = "admin-gitlab" 73 user = "admin-gitlab"
74 - email = "admin-gitlab@admin.com" 74 + email = "admin-gitlab@example.com"
75 password = SecureRandom.random_number.to_s 75 password = SecureRandom.random_number.to_s
76 76
77 - command "RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{name}\', username: \'#{name}, email: #{email}, password: #{password}, admin: true)\"" 77 + command "RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{user}\', username: \'#{user}, email: #{email}, password: #{password}, admin: true)\""
78 78
79 user_exist = Dir.chdir '/usr/lib/gitlab' do 79 user_exist = Dir.chdir '/usr/lib/gitlab' do
80 - `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@admin.com).nil?\"`.strip 80 + `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@example.com).nil?\"`.strip
81 end 81 end
82 82
83 not_if {user_exist == "false"} 83 not_if {user_exist == "false"}
@@ -94,7 +94,7 @@ template '/etc/colab/settings.d/01-apps.yaml' do @@ -94,7 +94,7 @@ template '/etc/colab/settings.d/01-apps.yaml' do
94 94
95 get_private_token = lambda do 95 get_private_token = lambda do
96 Dir.chdir '/usr/lib/gitlab' do 96 Dir.chdir '/usr/lib/gitlab' do
97 - `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@admin.com).private_token\"`.strip 97 + `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@example.com).private_token\"`.strip
98 end 98 end
99 end 99 end
100 100