Commit 2dbb627d3ed9d5438e5577bff2ea13a72301c497

Authored by Paulo Tada
Committed by Sergio Oliveira
1 parent 2603f337
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, 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, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, 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, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Changing call setting.py to custom_settings.py

Showing 1 changed file with 17 additions and 1 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
... ... @@ -34,6 +34,13 @@ directory '/var/lock/colab' do
34 34 mode 0755
35 35 end
36 36  
  37 +execute 'secret-key' do
  38 + f = '/etc/colab/secret.key'
  39 + command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"
  40 + not_if { File.exists?(f) }
  41 + notifies :create, 'template[/etc/colab/settings.d/04-custom_settings.py]'
  42 +end
  43 +
37 44 template '/etc/sysconfig/colab' do
38 45 owner 'root'
39 46 group 'root'
... ... @@ -48,7 +55,7 @@ template '/etc/colab/settings.d/00-database.py' do
48 55 notifies :restart, 'service[colab]'
49 56 end
50 57  
51   -template '/etc/colab/settings.d/04-settings.py' do
  58 +template '/etc/colab/settings.d/04-custom_settings.py' do
52 59 owner 'root'
53 60 group 'colab'
54 61 mode 0640
... ... @@ -118,6 +125,15 @@ template '/etc/colab/plugins.d/gitlab.py' do
118 125 owner 'root'
119 126 group 'colab'
120 127 mode 0640
  128 + get_private_token = lambda do
  129 + Dir.chdir '/usr/lib/gitlab' do
  130 + `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip
  131 + end
  132 + end
  133 +
  134 + variables(
  135 + :get_private_token => get_private_token
  136 + )
121 137 end
122 138  
123 139 template '/etc/colab/plugins.d/noosfero.py' do
... ...