Merge Request #25
← To merge requests
From
update_spec
into
master
Update spec
Update spec to compile static files in RPM package
Commits (3)
-
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
-
Added proxied apps variable in settins.yaml Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing
3 changed files
Show diff stats
.gitignore
colab.spec
1 | %define name colab | 1 | %define name colab |
2 | -%define version 2.0a1 | ||
3 | -%define unmangled_version 2.0a1 | 2 | +%define version 2.0a2 |
3 | +%define unmangled_version 2.0a2 | ||
4 | %define release 1 | 4 | %define release 1 |
5 | %define buildvenv /var/tmp/%{name}-%{version} | 5 | %define buildvenv /var/tmp/%{name}-%{version} |
6 | 6 | ||
@@ -147,6 +147,10 @@ ALLOWED_HOSTS: | @@ -147,6 +147,10 @@ ALLOWED_HOSTS: | ||
147 | 147 | ||
148 | ## Disable indexing | 148 | ## Disable indexing |
149 | ROBOTS_NOINDEX: false | 149 | ROBOTS_NOINDEX: false |
150 | + | ||
151 | +#PROXIED_APPS: | ||
152 | +# gitlab: | ||
153 | +# upstream: 'http://localhost:8080/gitlab/' | ||
150 | EOF | 154 | EOF |
151 | chown root:colab /etc/colab/settings.yaml | 155 | chown root:colab /etc/colab/settings.yaml |
152 | chmod 0640 /etc/colab/settings.yaml | 156 | chmod 0640 /etc/colab/settings.yaml |
@@ -171,3 +175,15 @@ fi | @@ -171,3 +175,15 @@ fi | ||
171 | if [ -f /etc/colab/settings.yaml ]; then | 175 | if [ -f /etc/colab/settings.yaml ]; then |
172 | colab-admin migrate | 176 | colab-admin migrate |
173 | fi | 177 | fi |
178 | + | ||
179 | +mkdir -p /var/lib/colab-assets | ||
180 | +chown colab:colab /var/lib/colab-assets | ||
181 | + | ||
182 | +mkdir -p /usr/share/nginx/ | ||
183 | + | ||
184 | +ln -s /var/lib/colab-assets /usr/share/nginx/colab | ||
185 | + | ||
186 | +if [ -f /etc/colab/settings.yaml ]; then | ||
187 | + yes yes | colab-admin collectstatic | ||
188 | +fi | ||
189 | + |
setup.py
@@ -11,7 +11,7 @@ EXCLUDE_FROM_PACKAGES = [] | @@ -11,7 +11,7 @@ EXCLUDE_FROM_PACKAGES = [] | ||
11 | 11 | ||
12 | setup( | 12 | setup( |
13 | name='colab', | 13 | name='colab', |
14 | - version='2.0a1', | 14 | + version='2.0a2', |
15 | url='https://github.com/colab-community/colab', | 15 | url='https://github.com/colab-community/colab', |
16 | author='Sergio Oliveira', | 16 | author='Sergio Oliveira', |
17 | author_email='sergio@tracy.com.br', | 17 | author_email='sergio@tracy.com.br', |