Download as
Browse Code »

Commit 10263cde257d4c0941f29845cbbb8ada82a1825b

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

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 175 execute 'colab-admin migrate'
176 176  
177 177 # Static files
178   -directory '/var/lib/colab-assets/spb/' do
  178 +directory '/var/lib/colab/assets/spb/' do
179 179 owner 'root'
180 180 group 'root'
181 181 mode 0755
182 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 185 owner 'root'
186 186 group 'root'
187 187 mode 0644
... ...
cookbooks/colab/templates/colab.conf.erb
  Diff comments   View file @10263cd
... ... @@ -12,7 +12,7 @@ server {
12 12 client_max_body_size 150m;
13 13  
14 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 18 location / {
... ...