diff --git a/nginx_gunicorn/pandora.conf b/nginx_gunicorn/pandora.conf index d5d22ac25..f25ac1044 100644 --- a/nginx_gunicorn/pandora.conf +++ b/nginx_gunicorn/pandora.conf @@ -5,10 +5,13 @@ description "pandora daemon" start on runlevel [2345] stop on runlevel [!2345] - +kill timeout 5 respawn -chdir /srv/pandora/pandora - -exec /srv/pandora/bin/gunicorn_django --daemon -u pandora -g pandora -b 127.0.0.1:8083 -w5 settings.py +env VENV=/srv/pandora +env USER=pandora +script +cd $VENV/pandora +exec sudo -u $USER $VENV/bin/gunicorn_django -b 127.0.0.1:8083 -w5 $VENV/pandora/settings.py +end script diff --git a/requirements.txt b/requirements.txt index e54cc0e8b..eb4ee8546 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,7 @@ django_extensions -e bzr+http://firefogg.org/dev/python-firefogg/#egg=python-firefogg -e git+git://github.com/dcramer/django-devserver#egg=django_devserver transmissionrpc + +#needs git to work with upstart +#https://github.com/benoitc/gunicorn/commit/f29c61091691135dcfae029a7eadf1663a06a73e +-e git+https://github.com/benoitc/gunicorn.git#egg=gunicorn