Commit 57eedec6fec77e68e6080da8f2c0bc7738af59da

Authored by Sergio Oliveira
2 parents b355eea2 66d2691f
Exists in master and in 1 other branch updatev3

Merge branch 'colab-master'

Showing 2 changed files with 2 additions and 6 deletions   Show diff stats
colab-deps/colab-deps.spec
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
@@ -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