Download as
Browse Code »

Commit 767a35418e9c699d13ac5117a683e068889e8b3b

Authored by Alexandre Barbosa
Committed by Lucas Kanashiro
1 parent 4bb94964
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Compile assets in spec file 

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 2 changed files with 16 additions and 3 deletions   Show diff stats
colab.spec
  Diff comments   View file @767a354
1 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 4 %define release 1
5 5 %define buildvenv /var/tmp/%{name}-%{version}
6 6  
... ... @@ -147,6 +147,10 @@ ALLOWED_HOSTS:
147 147  
148 148 ## Disable indexing
149 149 ROBOTS_NOINDEX: false
  150 +
  151 +#PROXIED_APPS:
  152 +# gitlab:
  153 +# upstream: 'http://localhost:8080/gitlab/'
150 154 EOF
151 155 chown root:colab /etc/colab/settings.yaml
152 156 chmod 0640 /etc/colab/settings.yaml
... ... @@ -171,3 +175,12 @@ fi
171 175 if [ -f /etc/colab/settings.yaml ]; then
172 176 colab-admin migrate
173 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 +sudo colab-admin collectstatic
... ...
setup.py
  Diff comments   View file @767a354
... ... @@ -11,7 +11,7 @@ EXCLUDE_FROM_PACKAGES = []
11 11  
12 12 setup(
13 13 name='colab',
14   - version='2.0a1',
  14 + version='2.0a2',
15 15 url='https://github.com/colab-community/colab',
16 16 author='Sergio Oliveira',
17 17 author_email='sergio@tracy.com.br',
... ...