Download as
Browse Code »

Commit 181a5482c8a32e792b86abb5e352c41bb1343ae8

Authored by Sergio Oliveira
2 parents 9f9b1457 32406b9c
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

Merge branch 'master' of beta.softwarepublico.gov.br:softwarepublico/colab

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
colab.spec
  Diff comments   View file @181a548
1 1 %define name colab
2 2 %define version 2.0a2
3 3 %define unmangled_version 2.0a2
4   -%define release 1
  4 +%define release 2
5 5 %define buildvenv /var/tmp/%{name}-%{version}
6 6  
7 7 Summary: Collaboration platform for communities
... ... @@ -54,7 +54,7 @@ cat > %{buildroot}/%{_bindir}/colab-admin <<EOF
54 54 #!/bin/sh
55 55 set -e
56 56  
57   -if [ "$USER" = colab ]; then
  57 +if [ "\$USER" = colab ]; then
58 58 exec /usr/lib/colab/bin/colab-admin "\$@"
59 59 else
60 60 exec sudo -u colab /usr/lib/colab/bin/colab-admin "\$@"
... ...
colab/settings.py
  Diff comments   View file @181a548
... ... @@ -251,7 +251,7 @@ MESSAGE_TAGS = {
251 251 COLAB_HOME_URL = '/dashboard'
252 252  
253 253 # Super Archives
254   -SUPER_ARCHIVES_PATH = '/var/lib/mailman/archives/public'
  254 +SUPER_ARCHIVES_PATH = '/var/lib/mailman/archives/private'
255 255 SUPER_ARCHIVES_EXCLUDE = []
256 256 SUPER_ARCHIVES_LOCK_FILE = '/var/lock/colab/import_emails.lock'
257 257  
... ...