Merge branch 'master' of https://github.com/TurboGears/tgwebsite

TurboGears · Mar 12, 2013 · bb98137 · bb98137
2 parents 1a67d75 + 63443e2
commit bb98137
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/apache.conf b/apache.conf
@@ -104,7 +104,8 @@
 # trac (historical)
 <VirtualHost *:80>
 	ServerName trac.turbogears.org
-	WSGIScriptAlias / /home/turbogearsorg/siterepo/website/trac
+        ServerAlias tracnew.turbogears.org
+	WSGIScriptAlias / /home/turbogearsorg/siterepo/website/trac/trac.wsgi
 
         <Directory /home/turbogearsorg/siterepo/website/trac>
            WSGIApplicationGroup %{GLOBAL}

diff --git a/trac/trac.wsgi b/trac/trac.wsgi
@@ -1,9 +1,12 @@
-import os
 import sys
-
 sys.stdout = sys.stderr
+
+import site 
+site.addsitedir('/home/turbogearsorg/tracvenv/lib/python2.6/site-packages')
+
+import os
 os.environ['PYTHON_EGG_CACHE'] = '/home/turbogearsorg/tracvenv/traceggs'
-os.environ['TRAC_ENV'] = '/home/turbogearsorg/tracvenv'
+os.environ['TRAC_ENV'] = '/home/turbogearsorg/tracvenv/project'
 
 import trac.web.main