Download as
Browse Code »

Commit c619706f514b1ca0a56cc76ecd4a274301aedaef

Authored by Lucas Moura
Committed by Luciano Prestes
1 parent e85beced
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

Creating colab user for gitlab indexing 

Changing the way the colab user was created by changing the approach to using a json file together with the command colab-admin loaddata

Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing 2 changed files with 25 additions and 4 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @c619706
@@ -53,12 +53,20 @@ template &#39;/etc/colab/settings.d/00-database.yaml&#39; do @@ -53,12 +53,20 @@ template &#39;/etc/colab/settings.d/00-database.yaml&#39; do
53 notifies :restart, 'service[colab]' 53 notifies :restart, 'service[colab]'
54 end 54 end
55 55
56 -execute 'create-admin-token-colab' do  
57 - user = "admin-gitlab"  
58 - email = "admin-gitlab@admin.com" 56 +template '/tmp/admin-gitlab.json' do
  57 +
59 password = SecureRandom.random_number.to_s 58 password = SecureRandom.random_number.to_s
60 59
61 - command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell" 60 + variables(
  61 + :password => password
  62 + )
  63 +end
  64 +
  65 +execute 'create-admin-token-colab' do
  66 + command "colab-admin loaddata admin-gitlab.json"
  67 +
  68 + cwd '/tmp'
  69 + user 'root'
62 end 70 end
63 71
64 execute 'create-admin-token-gitlab' do 72 execute 'create-admin-token-gitlab' do
cookbooks/colab/templates/admin-gitlab.json.erb 0 → 100644
  Diff comments   View file @c619706
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
  1 +[
  2 + {
  3 + "model": "accounts.user",
  4 + "fields": {
  5 + "username": "admin-gitlab",
  6 + "first_name": "Admin",
  7 + "last_name": "Gitlab",
  8 + "email": "admin-gitlab@admin.com",
  9 + "password": "<%= @password %>",
  10 + "modified": "2015-06-11 14:22:00.332432+00"
  11 + }
  12 + }
  13 +]
0 \ No newline at end of file 14 \ No newline at end of file