Download as
Browse Code »

Commit 79ca9138a6169bc480f01224aaa78ffad243ec59

Authored by Sergio Oliveira
1 parent 57eedec6
Exists in master and in 1 other branch updatev3

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 17 Url: https://github.com/colab/colab
18 18 BuildArch: noarch
19 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 23 %description
23 24 Integrated software development platform.
... ... @@ -213,10 +214,8 @@ EOF
213 214 chmod 0640 /etc/colab/settings.py
214 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 220 chown -R colab:colab /var/lib/colab/assets
222 221 colab-admin collectstatic --noinput
... ...