From: Radek Czajka Date: Mon, 26 Sep 2011 10:14:30 +0000 (+0200) Subject: wsgi fix X-Git-Url: https://git.mdrn.pl/koed-quiz.git/commitdiff_plain/954dc6262de4eb9e84ae2e81cbd28cd536b569bd wsgi fix --- diff --git a/fabfile.py b/fabfile.py index 0d64fe1..e06bdda 100644 --- a/fabfile.py +++ b/fabfile.py @@ -10,6 +10,7 @@ import os # ========== # Globals env.project_name = 'koedquiz' +env.wsgi_name = env.project_name env.use_south = True env.virtualenv = '/usr/bin/virtualenv' @@ -44,6 +45,7 @@ def openquiz(): env.server_admin = 'Radek Czajka ' env.access_log = 'koedquiz/openquiz.log' env.error_log = 'koedquiz/openquiz-errors.log' + env.wsgi_name = 'openquiz' def pdquiz(): env.hosts = ['giewont.icm.edu.pl'] @@ -53,6 +55,7 @@ def pdquiz(): env.server_admin = 'Radek Czajka ' env.access_log = 'koedquiz/pdquiz.log' env.error_log = 'koedquiz/pdquiz-errors.log' + env.wsgi_name = 'pdquiz' diff --git a/koedquiz.vhost.template b/koedquiz.vhost.template index 3caae7f..57591ac 100644 --- a/koedquiz.vhost.template +++ b/koedquiz.vhost.template @@ -2,8 +2,8 @@ ServerName "%(server_name)s" ServerAdmin "%(server_admin)s" - WSGIDaemonProcess %(project_name)s user=%(user)s group=%(user)s processes=2 threads=15 display-name=%%{GROUP} python-path=%(site_packages)s - WSGIProcessGroup %(project_name)s + WSGIDaemonProcess %(wsgi_name)s user=%(user)s group=%(user)s processes=2 threads=15 display-name=%%{GROUP} python-path=%(site_packages)s + WSGIProcessGroup %(wsgi_name)s WSGIScriptAlias / %(path)s/%(project_name)s.wsgi