Download as
Browse Code »

Commit 18c8b6adf50ad824d15c89d731345336431b3fef

Authored by Sergio Oliveira
1 parent c581e161
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, 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

Replacing logo and favico using nginx alias

Showing 3 changed files with 21 additions and 2 deletions   Show diff stats
cookbooks/colab/files/default/fav.ico 0 → 100644
View file @18c8b6a
No preview for this file type
cookbooks/colab/recipes/default.rb
  Diff comments   View file @18c8b6a
@@ -41,11 +41,22 @@ template '/etc/colab/settings.d/01-apps.yaml' do @@ -41,11 +41,22 @@ template '/etc/colab/settings.d/01-apps.yaml' do
41 notifies :restart, 'service[colab]' 41 notifies :restart, 'service[colab]'
42 end 42 end
43 43
44 -cookbook_file '/usr/lib/colab/lib/python2.7/site-packages/colab/static/img/logo.svg' do 44 +directory '/var/lib/colab-assets/spb/' do
  45 + owner 'root'
  46 + group 'root'
  47 + mode 0755
  48 +end
  49 +
  50 +cookbook_file '/var/lib/colab-assets/spb/logo.svg' do
  51 + owner 'root'
  52 + group 'root'
  53 + mode 0644
  54 +end
  55 +
  56 +cookbook_file '/var/lib/colab-assets/spb/fav.ico' do
45 owner 'root' 57 owner 'root'
46 group 'root' 58 group 'root'
47 mode 0644 59 mode 0644
48 - notifies :run, 'execute[colab-admin:collectstatic]'  
49 end 60 end
50 61
51 execute 'colab-admin migrate' 62 execute 'colab-admin migrate'
cookbooks/colab/templates/colab.conf.erb
  Diff comments   View file @18c8b6a
@@ -10,6 +10,14 @@ server { @@ -10,6 +10,14 @@ 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$ {
  18 + alias /var/lib/colab-assets/spb/fav.ico;
  19 + }
  20 +
13 location / { 21 location / {
14 root /usr/share/nginx/colab; 22 root /usr/share/nginx/colab;
15 try_files $uri @colab-app; 23 try_files $uri @colab-app;