Download as
Browse Code »

Commit 6a9c04959032561b93d65b32cf6c5715ccf58e4e

Authored by Antonio Terceiro
1 parent 9426b750
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, 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, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

colab: retrieve and store noosfero api token

Showing 2 changed files with 6 additions and 0 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @6a9c049
@@ -148,6 +148,10 @@ template '/etc/colab/plugins.d/noosfero.py' do @@ -148,6 +148,10 @@ template '/etc/colab/plugins.d/noosfero.py' do
148 group 'colab' 148 group 'colab'
149 mode 0640 149 mode 0640
150 notifies :restart, 'service[colab]' 150 notifies :restart, 'service[colab]'
  151 + get_private_token = lambda do
  152 + `psql --tuples-only --host database --user colab -c "select private_token from users where login = 'admin-noosfero'" noosfero`.strip
  153 + end
  154 + variables(:get_private_token => get_private_token)
151 end 155 end
152 156
153 template '/etc/colab/plugins.d/spb.py' do 157 template '/etc/colab/plugins.d/spb.py' do
cookbooks/colab/templates/noosfero.py.erb
  Diff comments   View file @6a9c049
@@ -10,6 +10,8 @@ verbose_name = 'Noosfero Plugin' @@ -10,6 +10,8 @@ verbose_name = 'Noosfero Plugin'
10 10
11 upstream = 'http://<%= node['peers']['social'] %>:80/social/' 11 upstream = 'http://<%= node['peers']['social'] %>:80/social/'
12 12
  13 +private_token = '<%= @get_private_token.call %>'
  14 +
13 urls = { 15 urls = {
14 'include': 'colab_noosfero.urls', 16 'include': 'colab_noosfero.urls',
15 'namespace': 'noosfero', # TODO: do not allow to change namespace 17 'namespace': 'noosfero', # TODO: do not allow to change namespace