Download as
Browse Code »

Commit 10263cde257d4c0941f29845cbbb8ada82a1825b

Authored by Sergio Oliveira
2 parents 8e37b772 15086b19
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

Merge branch 'colab-assets' into 'master' 

Colab assets

@seocam , a receita estava chamando colab-assets.

Ao convergir a integration eu recebia:

http://ur1.ca/nuqhc

O @rodrigo não observou o mesmo erro.

Após a aplicação do patch, o ambiente converge, mas ainda tenho problemas com JS do noosfero.

See merge request !45
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @10263cd
@@ -175,13 +175,13 @@ end @@ -175,13 +175,13 @@ end
175 execute 'colab-admin migrate' 175 execute 'colab-admin migrate'
176 176
177 # Static files 177 # Static files
178 -directory '/var/lib/colab-assets/spb/' do 178 +directory '/var/lib/colab/assets/spb/' do
179 owner 'root' 179 owner 'root'
180 group 'root' 180 group 'root'
181 mode 0755 181 mode 0755
182 end 182 end
183 183
184 -cookbook_file '/var/lib/colab-assets/spb/fav.ico' do 184 +cookbook_file '/var/lib/colab/assets/spb/fav.ico' do
185 owner 'root' 185 owner 'root'
186 group 'root' 186 group 'root'
187 mode 0644 187 mode 0644
cookbooks/colab/templates/colab.conf.erb
  Diff comments   View file @10263cd
@@ -12,7 +12,7 @@ server { @@ -12,7 +12,7 @@ server {
12 client_max_body_size 150m; 12 client_max_body_size 150m;
13 13
14 location ~ ^/static/img/fav\.[^.]+\.ico$ { 14 location ~ ^/static/img/fav\.[^.]+\.ico$ {
15 - alias /var/lib/colab-assets/spb/fav.ico; 15 + alias /var/lib/colab/assets/spb/fav.ico;
16 } 16 }
17 17
18 location / { 18 location / {