wsgi fix

diff --git a/fabfile.py b/fabfile.py
index 0d64fe1..e06bdda 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -10,6 +10,7 @@ import os
 # ==========
 # Globals
 env.project_name = 'koedquiz'
 # ==========
 # Globals
 env.project_name = 'koedquiz'

+env.wsgi_name = env.project_name

 env.use_south = True
 env.virtualenv = '/usr/bin/virtualenv'
 
 env.use_south = True
 env.virtualenv = '/usr/bin/virtualenv'
 


@@ -44,6 +45,7 @@ def openquiz():
     env.server_admin = 'Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>'
     env.access_log = 'koedquiz/openquiz.log'
     env.error_log = 'koedquiz/openquiz-errors.log'
     env.server_admin = 'Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>'
     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']
 
 def pdquiz():
     env.hosts = ['giewont.icm.edu.pl']


@@ -53,6 +55,7 @@ def pdquiz():
     env.server_admin = 'Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>'
     env.access_log = 'koedquiz/pdquiz.log'
     env.error_log = 'koedquiz/pdquiz-errors.log'
     env.server_admin = 'Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>'
     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 (file)
--- a/koedquiz.vhost.template
+++ b/koedquiz.vhost.template
@@ -2,8 +2,8 @@
     ServerName "%(server_name)s"
     ServerAdmin "%(server_admin)s"
 
     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
     <Directory %(path)s>
 
     WSGIScriptAlias / %(path)s/%(project_name)s.wsgi
     <Directory %(path)s>