Download as
Browse Code »

Commit 1cf7f36aa176552f3861b7d2439dbfe835a3ee22

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

Get private token of colab-admin and put on gitlab plugin configuration 

Signed-off-by: Gustavo Jaruga  <darksshades@gmail.com>
Signed-off-by: Lucas Moura  <lucas.moura128@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing 3 changed files with 30 additions and 24 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @1cf7f36
... ... @@ -53,11 +53,40 @@ 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
  57 + user = "admin-gitlab"
  58 + email = "admin-gitlab@admin.com"
  59 + password = SecureRandom.random_number.to_s
  60 +
  61 + command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell"
  62 +end
  63 +
  64 +execute 'admin-token' do
  65 + user = "admin-gitlab"
  66 + email = "admin-gitlab@admin.com"
  67 + password = SecureRandom.random_number.to_s
  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\')\""
  70 +
  71 + cwd '/usr/lib/gitlab'
  72 + user 'root'
  73 +end
  74 +
56 75 template '/etc/colab/settings.d/01-apps.yaml' do
57 76 owner 'root'
58 77 group 'colab'
59 78 mode 0640
60 79 notifies :restart, 'service[colab]'
  80 +
  81 + get_private_token = lambda do
  82 + Dir.chdir '/usr/lib/gitlab' do
  83 + `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@admin.com\').private_token\"`.strip
  84 + end
  85 + end
  86 +
  87 + variables(
  88 + :get_private_token => get_private_token
  89 + )
61 90 end
62 91  
63 92 template '/etc/colab/settings.d/02-logging.yaml' do
... ... @@ -100,11 +129,3 @@ service &#39;colab&#39; do
100 129 action [:enable, :start]
101 130 supports :restart => true
102 131 end
103   -
104   -execute 'create token-admin' do
105   - user = "admin-gitlab"
106   - email = "admin-gitlab@admin.com"
107   - password = SecureRandom.random_number.to_s
108   -
109   - command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell"
110   -end
... ...
cookbooks/colab/templates/01-apps.yaml.erb
  Diff comments   View file @1cf7f36
... ... @@ -2,5 +2,6 @@
2 2 PROXIED_APPS:
3 3 gitlab:
4 4 upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
  5 + private_token: '<%= @get_private_token.call %>'
5 6 noosfero:
6 7 upstream: 'http://<%= node['peers']['social'] %>:80/social/'
... ...
cookbooks/gitlab/recipes/default.rb
  Diff comments   View file @1cf7f36
... ... @@ -95,19 +95,3 @@ execute &#39;selinux-gitlab&#39; do
95 95 command 'selinux-install-module /etc/selinux/local/gitlab.te'
96 96 action :nothing
97 97 end
98   -
99   -execute 'admin-token' do
100   - user = "admin-gitlab"
101   - email = "admin-gitlab@admin.com"
102   - password = SecureRandom.random_number.to_s
103   -
104   - command "bundle exec rails c production << EOF
105   - user = User.create(name: \'#{name}\', username: \'#{name}\', email: \'#{email}\', password: \'#{password}\')
106   - user.admin = true
107   - user.save
108   - exit
109   - EOF"
110   -
111   - cwd '/usr/lib/gitlab'
112   - user 'git'
113   -end
... ...