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

Luan
2 parents 4eff79a2 65e58268
Showing 8 changed files with 36 additions and 10 deletions Show diff stats
puppet/modules/colab/manifests/init.pp
puppet/modules/colab/manifests/requirements.pp
requirements.txt
src/colab/custom_settings.py
src/templates/404.html
src/templates/500.html
src/templates/home.html
src/templates/includes/big_header.html
@@ -45,7 +45,7 @@ class colab {
   }
   supervisor::app { 'colab':
-    command   => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -t 300',
+    command   => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application --timeout=300 --worker-class=gevent --workers=5',
     directory => '/home/colab/colab/src/',
     user      => 'colab',
   }
@@ -88,4 +88,9 @@ class colab::requirements {
   package { 'openjdk-7-jre':
     ensure => installed,
   }
+
+  package { 'memcached':
+    ensure => installed,
+  }
+
 }
@@ -13,6 +13,7 @@ pysolr==2.1
 etiquetando==0.1
 html2text
 django-taggit
+python-memcached
 gunicorn
 gevent
@@ -63,6 +63,13 @@ DATABASES = {
     }
 }
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+    }
+}
+
 DATABASE_ROUTERS = ['colab.routers.TracRouter',]
 INSTALLED_APPS = INSTALLED_APPS + (
+{% extends "base.html" %}
 {% load i18n %}
-<h1>{% trans "Not found. Keep searching! :)" %}</h1>
+{% block main-content %}
+  <h1>{% trans "Not found. Keep searching! :)" %}</h1>
+{% endblock %}
+
+{% block footer %}{% endblock %}
+{% extends "base.html" %}
 {% load i18n %}
-<h1>{% trans "Ooopz... something went wrong!" %}</h1>
+{% block main-content %}
+  <h1>{% trans "Ooopz... something went wrong!" %}</h1>
+{% endblock %}
+
+{% block footer %}{% endblock %}
@@ -6,13 +6,7 @@
 {% endblock %}
 {% block header %}
-  <div class="row hidden-xs hidden-sm">
-    <div class="col-lg-2 col-lg-offset-5 text-center">
-      <img src="{{ STATIC_URL }}img/logo.png" />
-    </div>
-  </div>
-
-  <h3 class="text-center hidden-xs hidden-sm">{% trans "INTERLEGIS COMMUNITIES" %}</h3>
+  {% include "includes/big_header.html" %}
 {% endblock %}
 {% block main-content %}
@@ -0,0 +1,9 @@
+{% load i18n %}
+
+<div class="row hidden-xs hidden-sm">
+  <div class="col-lg-2 col-lg-offset-5 text-center">
+    <img src="{{ STATIC_URL }}img/logo.png" />
+  </div>
+</div>
+
+<h3 class="text-center hidden-xs hidden-sm">{% trans "INTERLEGIS COMMUNITIES" %}</h3>
	@@ -45,7 +45,7 @@ class colab {		@@ -45,7 +45,7 @@ class colab {
45	}	45	}
46		46
47	supervisor::app { 'colab':	47	supervisor::app { 'colab':
48	- command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application -t 300',	48	+ command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application --timeout=300 --worker-class=gevent --workers=5',
49	directory => '/home/colab/colab/src/',	49	directory => '/home/colab/colab/src/',
50	user => 'colab',	50	user => 'colab',
51	}	51	}
	@@ -88,4 +88,9 @@ class colab::requirements {		@@ -88,4 +88,9 @@ class colab::requirements {
88	package { 'openjdk-7-jre':	88	package { 'openjdk-7-jre':
89	ensure => installed,	89	ensure => installed,
90	}	90	}
		91	+
		92	+ package { 'memcached':
		93	+ ensure => installed,
		94	+ }
		95	+
91	}	96	}
	@@ -13,6 +13,7 @@ pysolr==2.1		@@ -13,6 +13,7 @@ pysolr==2.1
13	etiquetando==0.1	13	etiquetando==0.1
14	html2text	14	html2text
15	django-taggit	15	django-taggit
		16	+python-memcached
16		17
17	gunicorn	18	gunicorn
18	gevent	19	gevent
	@@ -63,6 +63,13 @@ DATABASES = {		@@ -63,6 +63,13 @@ DATABASES = {
63	}	63	}
64	}	64	}
65		65
		66	+CACHES = {
		67	+ 'default': {
		68	+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
		69	+ 'LOCATION': '127.0.0.1:11211',
		70	+ }
		71	+}
		72	+
66	DATABASE_ROUTERS = ['colab.routers.TracRouter',]	73	DATABASE_ROUTERS = ['colab.routers.TracRouter',]
67		74
68	INSTALLED_APPS = INSTALLED_APPS + (	75	INSTALLED_APPS = INSTALLED_APPS + (
		1	+{% extends "base.html" %}
1	{% load i18n %}	2	{% load i18n %}
2		3
3	-<h1>{% trans "Not found. Keep searching! :)" %}</h1>	4	+{% block main-content %}
		5	+ <h1>{% trans "Not found. Keep searching! :)" %}</h1>
		6	+{% endblock %}
		7	+
		8	+{% block footer %}{% endblock %}
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+{% load i18n %}
	2	+
	3	+<div class="row hidden-xs hidden-sm">
	4	+ <div class="col-lg-2 col-lg-offset-5 text-center">
	5	+ <img src="{{ STATIC_URL }}img/logo.png" />
	6	+ </div>
	7	+</div>
	8	+
	9	+<h3 class="text-center hidden-xs hidden-sm">{% trans "INTERLEGIS COMMUNITIES" %}</h3>