Commit 9fdd56e82842c5f7b2e02786031e4e881aebb078
Exists in
master
and in
39 other branches
Merge branch 'master' of github.com:TracyWebTech/colab
Showing
8 changed files
with
36 additions
and
10 deletions
Show diff stats
puppet/modules/colab/manifests/init.pp
... | ... | @@ -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 -t 300', | |
48 | + command => '/home/colab/.virtualenvs/colab/bin/gunicorn colab.wsgi:application --timeout=300 --worker-class=gevent --workers=5', | |
49 | 49 | directory => '/home/colab/colab/src/', |
50 | 50 | user => 'colab', |
51 | 51 | } | ... | ... |
puppet/modules/colab/manifests/requirements.pp
requirements.txt
src/colab/custom_settings.py
... | ... | @@ -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 | 73 | DATABASE_ROUTERS = ['colab.routers.TracRouter',] |
67 | 74 | |
68 | 75 | INSTALLED_APPS = INSTALLED_APPS + ( | ... | ... |
src/templates/404.html
src/templates/500.html
src/templates/home.html
... | ... | @@ -6,13 +6,7 @@ |
6 | 6 | {% endblock %} |
7 | 7 | |
8 | 8 | {% block header %} |
9 | - <div class="row hidden-xs hidden-sm"> | |
10 | - <div class="col-lg-2 col-lg-offset-5 text-center"> | |
11 | - <img src="{{ STATIC_URL }}img/logo.png" /> | |
12 | - </div> | |
13 | - </div> | |
14 | - | |
15 | - <h3 class="text-center hidden-xs hidden-sm">{% trans "INTERLEGIS COMMUNITIES" %}</h3> | |
9 | + {% include "includes/big_header.html" %} | |
16 | 10 | {% endblock %} |
17 | 11 | |
18 | 12 | {% block main-content %} | ... | ... |
... | ... | @@ -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> | ... | ... |