Changeset 586

Timestamp:

10/15/08 16:18:03 (5 years ago)

Author:

rcorsaro

Message:

settings and python path are now dealt with in apache conf and trac.wsgi.

Location:

trunk/plugins/oforgeplugin

Files:

• oforge/api.py (modified) (1 diff)
• share/cgi-bin/trac.wsgi (modified) (2 diffs)

trunk/plugins/oforgeplugin/oforge/api.py

@@ -16 +16 @@
 from trac.db import get_column_names, Column, Index, DatabaseManager
 from trac.perm import PermissionSystem
-
-os.environ['DJANGO_SETTINGS_MODULE'] = 'oforgetools.settings'
 
 from oforgetools.projects.models import Project

trunk/plugins/oforgeplugin/share/cgi-bin/trac.wsgi

@@ -5 +5 @@
 #   http://code.google.com/p/modwsgi/wiki/IntegrationWithTrac
 #   http://trac.edgewall.org/wiki/TracModWSGI
+import os
 import sys
 sys.stdout = sys.stderr
@@ -12 +13 @@
 trac.db.postgres_backend.PostgreSQLConnection.poolable = False
 
-from trac.web.main import dispatch_request as application
+from trac.web.main import dispatch_request
 
+def application(environ, start_request):
+    os.environ['DJANGO_SETTINGS_MODULE'] = environ.get(
+            'oforge.django_settings', 'oforgetools.settings')
+    return dispatch_request(environ, start_request)
+