Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Martin Mahner 2013-11-30 13:04:41 +01:00
commit 7f7a53aa62
2 changed files with 3 additions and 1 deletions

View file

@ -14,3 +14,4 @@ docutils
django-redis==3.3
gunicorn==18.0
south==0.8.2
newrelic

View file

@ -7,7 +7,8 @@ respawn limit 10 5
setuid www-data
setgid www-data
exec /srv/dpaste.de/bin/python /srv/dpaste.de/bin/manage.py run_gunicorn \
exec NEW_RELIC_CONFIG_FILE=/srv/dpaste.de/var/newrelic.ini \
/srv/dpaste.de/bin/newrelic-admin run-program /srv/dpaste.de/bin/python /srv/dpaste.de/bin/manage.py run_gunicorn \
--user=www-data \
--group=www-data \
--workers=2 \