Download as
Browse Code »

Commit 0ed80dcecf79c94d9d4a42433169e259fef8089a

Authored by Sergio Oliveira
Committed by Rodrigo Siqueira de Melo
1 parent 4dd7ca66
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

Using files attr to set user/group 

Signed-off-by: Matheus Fernandes <msfernandes@gmail.com>
Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Showing 1 changed file with 22 additions and 11 deletions   Show diff stats
colab/colab.spec
  Diff comments   View file @0ed80dc
@@ -49,9 +49,19 @@ find %{buildvenv} -type d -empty -delete @@ -49,9 +49,19 @@ find %{buildvenv} -type d -empty -delete
49 install -d -m 0755 %{buildroot}/etc/colab 49 install -d -m 0755 %{buildroot}/etc/colab
50 install -m 0644 misc/etc/colab/gunicorn.py %{buildroot}/etc/colab 50 install -m 0644 misc/etc/colab/gunicorn.py %{buildroot}/etc/colab
51 51
52 -# install log 52 +# Create settings dirs
  53 +install -d -m 0755 %{buildroot}/etc/colab/settings.d
  54 +install -d -m 0755 %{buildroot}/etc/colab/plugins.d
  55 +
  56 +# create log dir
53 install -d -m 0755 %{buildroot}/var/log/colab 57 install -d -m 0755 %{buildroot}/var/log/colab
54 58
  59 +# create celery dir
  60 +install -d -m 0755 %{buildroot}/var/lib/colab/celery
  61 +
  62 +# Create assets dir (stores static files)
  63 +install -d -m 0755 %{buildroot}/var/lib/colab/assets
  64 +
55 # install virtualenv 65 # install virtualenv
56 install -d -m 0755 %{buildroot}/usr/lib 66 install -d -m 0755 %{buildroot}/usr/lib
57 rm -rf %{buildroot}/usr/lib/colab 67 rm -rf %{buildroot}/usr/lib/colab
@@ -82,11 +92,19 @@ rm -rf $RPM_BUILD_ROOT @@ -82,11 +92,19 @@ rm -rf $RPM_BUILD_ROOT
82 rm -rf %{buildvenv} 92 rm -rf %{buildvenv}
83 93
84 %files 94 %files
  95 +%defattr(-, root, root)
  96 +
85 /usr/lib/colab 97 /usr/lib/colab
86 -/var/log/colab 98 +#/var/lib/colab # XXX: remove if doesnt break
  99 +%attr(-, colab, colab) /var/lib/colab/assets
  100 +%attr(-, colab, colab) /var/lib/colab/celery
  101 +%attr(-, colab, colab) /var/log/colab
87 %{_bindir}/* 102 %{_bindir}/*
88 /etc/cron.d/colab 103 /etc/cron.d/colab
89 -/etc/colab 104 +#/etc/colab # XXX: remove if doesnt break
  105 +/etc/colab/settings.d
  106 +/etc/colab/plugins.d
  107 +/etc/colab/gunicorn.py
90 /lib/systemd/system/colab.service 108 /lib/systemd/system/colab.service
91 109
92 %post 110 %post
@@ -192,16 +210,9 @@ EOF @@ -192,16 +210,9 @@ EOF
192 chmod 0640 /etc/colab/settings.py 210 chmod 0640 /etc/colab/settings.py
193 fi 211 fi
194 212
195 -mkdir -p /etc/colab/settings.d  
196 -  
197 -chown root:colab /etc/colab/settings.py  
198 -chmod 0640 /etc/colab/settings.py  
199 -  
200 -install -d -m 0755 -o colab -g colab /var/lib/colab-assets  
201 -  
202 # If nginx is available serve assets using it 213 # If nginx is available serve assets using it
203 if [ -d /usr/share/nginx ]; then 214 if [ -d /usr/share/nginx ]; then
204 - ln -s /var/lib/colab-assets /usr/share/nginx/colab 215 + ln -s /var/lib/colab/assets /usr/share/nginx/colab
205 fi 216 fi
206 217
207 yes yes | colab-admin collectstatic 218 yes yes | colab-admin collectstatic