From 79ca9138a6169bc480f01224aaa78ffad243ec59 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Thu, 24 Sep 2015 15:21:06 -0300 Subject: [PATCH] Colab now depends on nginx --- colab/colab.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/colab/colab.spec b/colab/colab.spec index a5d7bd7..fd817d3 100644 --- a/colab/colab.spec +++ b/colab/colab.spec @@ -17,7 +17,8 @@ Vendor: Sergio Oliveira Url: https://github.com/colab/colab BuildArch: noarch BuildRequires: colab-deps >= 1.11, python-virtualenv -Requires: colab-deps >= 1.11, solr, mailman-api >= 0.3 +# FIXME colab should not depend on nginx! +Requires: colab-deps >= 1.11, solr, mailman-api >= 0.3, nginx %description Integrated software development platform. @@ -213,10 +214,8 @@ EOF chmod 0640 /etc/colab/settings.py fi -# If nginx is available serve assets using it -if [ -d /usr/share/nginx ]; then - ln -s /var/lib/colab/assets /usr/share/nginx/colab -fi +# FIXME colab should not depend on nginx +ln -s /var/lib/colab/assets /usr/share/nginx/colab chown -R colab:colab /var/lib/colab/assets colab-admin collectstatic --noinput -- libgit2 0.21.2