Download as
Browse Code »

Commit 79ca9138a6169bc480f01224aaa78ffad243ec59

Authored by Sergio Oliveira
1 parent 57eedec6
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

Colab now depends on nginx 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Antonio Terceiro <terceiro@softwarelivre.org>
Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Showing 1 changed file with 4 additions and 5 deletions   Show diff stats
colab/colab.spec
  Diff comments   View file @79ca913
@@ -17,7 +17,8 @@ Vendor: Sergio Oliveira &lt;sergio@tracy.com.br&gt; @@ -17,7 +17,8 @@ Vendor: Sergio Oliveira &lt;sergio@tracy.com.br&gt;
17 Url: https://github.com/colab/colab 17 Url: https://github.com/colab/colab
18 BuildArch: noarch 18 BuildArch: noarch
19 BuildRequires: colab-deps >= 1.11, python-virtualenv 19 BuildRequires: colab-deps >= 1.11, python-virtualenv
20 -Requires: colab-deps >= 1.11, solr, mailman-api >= 0.3 20 +# FIXME colab should not depend on nginx!
  21 +Requires: colab-deps >= 1.11, solr, mailman-api >= 0.3, nginx
21 22
22 %description 23 %description
23 Integrated software development platform. 24 Integrated software development platform.
@@ -213,10 +214,8 @@ EOF @@ -213,10 +214,8 @@ EOF
213 chmod 0640 /etc/colab/settings.py 214 chmod 0640 /etc/colab/settings.py
214 fi 215 fi
215 216
216 -# If nginx is available serve assets using it  
217 -if [ -d /usr/share/nginx ]; then  
218 - ln -s /var/lib/colab/assets /usr/share/nginx/colab  
219 -fi 217 +# FIXME colab should not depend on nginx
  218 +ln -s /var/lib/colab/assets /usr/share/nginx/colab
220 219
221 chown -R colab:colab /var/lib/colab/assets 220 chown -R colab:colab /var/lib/colab/assets
222 colab-admin collectstatic --noinput 221 colab-admin collectstatic --noinput