Download as
Browse Code »

Commit f4939c757a165ce78a069eb2ea54f11ab92cd81d

Authored by Sergio Oliveira
2 parents a267e487 c45aacf1
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 'update_puppet' of github.com:colab-community/colab into update_puppet

Showing 4 changed files with 13 additions and 7 deletions   Show diff stats
@@ -33,12 +33,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -33,12 +33,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
33 colab.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box" 33 colab.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box"
34 end 34 end
35 35
36 - colab.vm.network "forwarded_port", guest: 80, host: 80 36 + colab.vm.network :forwarded_port, guest: 80, host: 8080
  37 + colab.vm.network :forwarded_port, guest: 7000, host: 8000
  38 + colab.vm.network :forwarded_port, guest: 5280, host: 5280
  39 + colab.vm.network :forwarded_port, guest: 8080, host: 8081
  40 + colab.vm.network :forwarded_port, guest: 8983, host: 8983
  41 +
37 colab.vm.network "private_network", ip: "192.168.33.10" 42 colab.vm.network "private_network", ip: "192.168.33.10"
  43 +
38 colab.vm.provider "virtualbox" do |vb| 44 colab.vm.provider "virtualbox" do |vb|
39 # Use VBoxManage to customize the VM. For example to change memory: 45 # Use VBoxManage to customize the VM. For example to change memory:
40 vb.customize ["modifyvm", :id, "--memory", "1024"] 46 vb.customize ["modifyvm", :id, "--memory", "1024"]
41 end 47 end
  48 +
42 end 49 end
43 50
44 # Disable automatic box update checking. If you disable this, then 51 # Disable automatic box update checking. If you disable this, then
puppet/modules/colab/manifests/init.pp
  Diff comments   View file @f4939c7
@@ -24,7 +24,7 @@ class colab { @@ -24,7 +24,7 @@ class colab {
24 } 24 }
25 } 25 }
26 26
27 - ensure_packages(['mercurial', 'memcached']) 27 + ensure_packages(['memcached'])
28 28
29 # XMPP connection manager 29 # XMPP connection manager
30 pip::install { 'punjab': } 30 pip::install { 'punjab': }
requirements.txt
  Diff comments   View file @f4939c7
@@ -20,8 +20,8 @@ django-i18n-model==0.0.7 @@ -20,8 +20,8 @@ django-i18n-model==0.0.7
20 django-tastypie==0.11.0 20 django-tastypie==0.11.0
21 django-browserid==0.9 21 django-browserid==0.9
22 22
23 -gunicorn==18.0  
24 -gevent==0.13.8 23 +gunicorn==19.1.0
  24 +eventlet==0.15.0
25 25
26 # Deps for sentry client (raven) 26 # Deps for sentry client (raven)
27 raven==3.5.2 27 raven==3.5.2
src/colab/gunicorn.conf.py
  Diff comments   View file @f4939c7
1 1
2 import multiprocessing 2 import multiprocessing
3 3
4 -bind = "127.0.0.1:8000"  
5 -workers = multiprocessing.cpu_count() + 1 4 +workers = multiprocessing.cpu_count() * 2 + 1
6 timeout = 300 5 timeout = 300
7 -worker_class = 'gevent' 6 +worker_class = 'eventlet'