Commit 7d856238f39e97a7411a72afefb5f02e78095463

Authored by Gabriela Navarro
1 parent 595f4292
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

Fix logo reference from chef. Now the colab themes gets the right image

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
cookbooks/colab/recipes/default.rb
@@ -112,12 +112,6 @@ directory &#39;/var/lib/colab-assets/spb/&#39; do @@ -112,12 +112,6 @@ directory &#39;/var/lib/colab-assets/spb/&#39; do
112 mode 0755 112 mode 0755
113 end 113 end
114 114
115 -cookbook_file '/var/lib/colab-assets/spb/logo.svg' do  
116 - owner 'root'  
117 - group 'root'  
118 - mode 0644  
119 -end  
120 -  
121 cookbook_file '/var/lib/colab-assets/spb/fav.ico' do 115 cookbook_file '/var/lib/colab-assets/spb/fav.ico' do
122 owner 'root' 116 owner 'root'
123 group 'root' 117 group 'root'
cookbooks/colab/templates/colab.conf.erb
@@ -10,10 +10,6 @@ server { @@ -10,10 +10,6 @@ server {
10 access_log /var/log/nginx/colab.access.log; 10 access_log /var/log/nginx/colab.access.log;
11 error_log /var/log/nginx/colab.error.log; 11 error_log /var/log/nginx/colab.error.log;
12 12
13 - location ~ ^/static/img/logo\.[^.]+\.svg$ {  
14 - alias /var/lib/colab-assets/spb/logo.svg;  
15 - }  
16 -  
17 location ~ ^/static/img/fav\.[^.]+\.ico$ { 13 location ~ ^/static/img/fav\.[^.]+\.ico$ {
18 alias /var/lib/colab-assets/spb/fav.ico; 14 alias /var/lib/colab-assets/spb/fav.ico;
19 } 15 }