Merge branch 'update_puppet' of github.com:colab-community/colab into update_puppet

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