Merge branch 'master' of github.com:TracyWebTech/colab

Luan
2 parents 604b15a3 fcc14ee1
Showing 2 changed files with 8 additions and 1 deletions Show diff stats
puppet/modules/colab/manifests/init.pp
src/colab/gunicorn.conf.py
@@ -45,7 +45,7 @@ class colab {
   }
  
   supervisor::app { 'colab':
-    command   => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application --timeout=300 --worker-class=gevent --workers=5',
+    command   => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -c colab/gunicorn.conf.py',
     directory => '/home/colab/colab/src/',
     user      => 'colab',
   }
@@ -0,0 +1,7 @@
+
+import multiprocessing
+
+bind = "127.0.0.1:8000"
+workers = multiprocessing.cpu_count() + 1
+timeout = 300
+worker_class = 'gevent'
...	...	@@ -45,7 +45,7 @@ class colab {
45	45	}
46	46
47	47	supervisor::app { 'colab':
48		- command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application --timeout=300 --worker-class=gevent --workers=5',
	48	+ command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -c colab/gunicorn.conf.py',
49	49	directory => '/home/colab/colab/src/',
50	50	user => 'colab',
51	51	}
...	...
...	...	@@ -0,0 +1,7 @@
	1	+
	2	+import multiprocessing
	3	+
	4	+bind = "127.0.0.1:8000"
	5	+workers = multiprocessing.cpu_count() + 1
	6	+timeout = 300
	7	+worker_class = 'gevent'
...	...