From 767a35418e9c699d13ac5117a683e068889e8b3b Mon Sep 17 00:00:00 2001 From: Alexandre Barbosa Date: Mon, 12 Jan 2015 14:46:49 -0500 Subject: [PATCH] Compile assets in spec file --- colab.spec | 17 +++++++++++++++-- setup.py | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/colab.spec b/colab.spec index ee1c32d..f13017b 100644 --- a/colab.spec +++ b/colab.spec @@ -1,6 +1,6 @@ %define name colab -%define version 2.0a1 -%define unmangled_version 2.0a1 +%define version 2.0a2 +%define unmangled_version 2.0a2 %define release 1 %define buildvenv /var/tmp/%{name}-%{version} @@ -147,6 +147,10 @@ ALLOWED_HOSTS: ## Disable indexing ROBOTS_NOINDEX: false + +#PROXIED_APPS: +# gitlab: +# upstream: 'http://localhost:8080/gitlab/' EOF chown root:colab /etc/colab/settings.yaml chmod 0640 /etc/colab/settings.yaml @@ -171,3 +175,12 @@ fi if [ -f /etc/colab/settings.yaml ]; then colab-admin migrate fi + +mkdir -p /var/lib/colab-assets +chown colab:colab /var/lib/colab-assets + +mkdir -p /usr/share/nginx/ + +ln -s /var/lib/colab-assets /usr/share/nginx/colab + +sudo colab-admin collectstatic diff --git a/setup.py b/setup.py index 3c94cab..e4e9c6d 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ EXCLUDE_FROM_PACKAGES = [] setup( name='colab', - version='2.0a1', + version='2.0a2', url='https://github.com/colab-community/colab', author='Sergio Oliveira', author_email='sergio@tracy.com.br', -- libgit2 0.21.2