Download as
Browse Code »

Commit 57eedec6fec77e68e6080da8f2c0bc7738af59da

Authored by Sergio Oliveira
2 parents b355eea2 66d2691f
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-master'

Showing 2 changed files with 2 additions and 6 deletions   Show diff stats
colab-deps/colab-deps.spec
  Diff comments   View file @57eedec
1 %define name colab-deps 1 %define name colab-deps
2 -%define version 1.11 2 +%define version 1.11.0
3 %define release 1 3 %define release 1
4 4
5 Summary: Collaboration platform for communities (Python dependencies) 5 Summary: Collaboration platform for communities (Python dependencies)
colab/colab.spec
  Diff comments   View file @57eedec
@@ -97,7 +97,7 @@ rm -rf %{buildvenv} @@ -97,7 +97,7 @@ rm -rf %{buildvenv}
97 97
98 /usr/lib/colab 98 /usr/lib/colab
99 #/var/lib/colab # XXX: remove if doesnt break 99 #/var/lib/colab # XXX: remove if doesnt break
100 -/var/lib/colab/assets 100 +%attr(-, colab, colab) /var/lib/colab/assets
101 %attr(-, colab, colab) /var/lib/colab/celery 101 %attr(-, colab, colab) /var/lib/colab/celery
102 %attr(-, colab, colab) /var/log/colab 102 %attr(-, colab, colab) /var/log/colab
103 %{_bindir}/* 103 %{_bindir}/*
@@ -213,10 +213,6 @@ EOF @@ -213,10 +213,6 @@ EOF
213 chmod 0640 /etc/colab/settings.py 213 chmod 0640 /etc/colab/settings.py
214 fi 214 fi
215 215
216 -install -d -m 0750 -o root -g colab /etc/colab/settings.d  
217 -  
218 -install -d -m 0755 -o colab -g colab /var/lib/colab-assets  
219 -  
220 # If nginx is available serve assets using it 216 # If nginx is available serve assets using it
221 if [ -d /usr/share/nginx ]; then 217 if [ -d /usr/share/nginx ]; then
222 ln -s /var/lib/colab/assets /usr/share/nginx/colab 218 ln -s /var/lib/colab/assets /usr/share/nginx/colab