Download as
Browse Code »

Commit 54312b4bfb063e226265727b37c9942582e5171c

Authored by Alexandre Barbosa
Committed by Lucas Kanashiro
1 parent 370aa526
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Create lock directory 

Also move creation of assets symlink to the package build

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Antonio Terceiro <terceiro@softwarelivre.org>
Showing 1 changed file with 6 additions and 3 deletions   Show diff stats
@@ -46,6 +46,9 @@ find %{buildvenv} -type d -empty -delete @@ -46,6 +46,9 @@ find %{buildvenv} -type d -empty -delete
46 mkdir -p %{buildroot}/etc/colab 46 mkdir -p %{buildroot}/etc/colab
47 mkdir -p %{buildroot}/usr/lib 47 mkdir -p %{buildroot}/usr/lib
48 48
  49 +mkdir -p %{buildroot}/usr/share/nginx/
  50 +ln -s /var/lib/colab-assets %{buildroot}/usr/share/nginx/colab
  51 +
49 # install virtualenv 52 # install virtualenv
50 rm -rf %{buildroot}/usr/lib/colab 53 rm -rf %{buildroot}/usr/lib/colab
51 cp -r %{buildvenv} %{buildroot}/usr/lib/colab 54 cp -r %{buildvenv} %{buildroot}/usr/lib/colab
@@ -78,6 +81,7 @@ rm -rf %{buildvenv} @@ -78,6 +81,7 @@ rm -rf %{buildvenv}
78 %{_bindir}/* 81 %{_bindir}/*
79 /etc/cron.d/colab 82 /etc/cron.d/colab
80 /lib/systemd/system/colab.service 83 /lib/systemd/system/colab.service
  84 +/usr/share/nginx/colab
81 85
82 %post 86 %post
83 groupadd colab || true 87 groupadd colab || true
@@ -179,9 +183,8 @@ fi @@ -179,9 +183,8 @@ fi
179 mkdir -p /var/lib/colab-assets 183 mkdir -p /var/lib/colab-assets
180 chown colab:colab /var/lib/colab-assets 184 chown colab:colab /var/lib/colab-assets
181 185
182 -mkdir -p /usr/share/nginx/  
183 -  
184 -ln -s /var/lib/colab-assets /usr/share/nginx/colab 186 +mkdir -p /var/lock/colab
  187 +chown colab:colab /var/lock/colab
185 188
186 if [ -f /etc/colab/settings.yaml ]; then 189 if [ -f /etc/colab/settings.yaml ]; then
187 yes yes | colab-admin collectstatic 190 yes yes | colab-admin collectstatic