[z3-checkins] r10686 - z3/modzope/trunk/src/modzope

[philikon at codespeak.net]

Author: philikon
Date: Fri Apr 15 18:20:04 2005
New Revision: 10686

Modified:
   z3/modzope/trunk/src/modzope/app.py
Log:
get the location of modzope's ZConfig file from the environment;
that's the only location we have access to when this module is
imported by apache (although we would like to be able to configure
it thru httpd.conf)


Modified: z3/modzope/trunk/src/modzope/app.py
==============================================================================
--- z3/modzope/trunk/src/modzope/app.py	(original)
+++ z3/modzope/trunk/src/modzope/app.py	Fri Apr 15 18:20:04 2005
@@ -15,8 +15,7 @@
 
 $Id$
 """
-import sys
-import os.path
+import sys, os
 import zope.app.appsetup
 from zope.event import notify
 from zope.app.server.main import ZopeOptions
@@ -24,8 +23,7 @@
 
 class ModzopeOptions(ZopeOptions):
 
-    # XXX
-    configfile = "/Users/philipp/dev/Zope3/modzope-demosite/modzope.conf"
+    configfile = os.environ.get('MODZOPE_CONF', 'modzope.conf')
 
 def load_options(args=[]):
     options = ModzopeOptions()
@@ -45,10 +43,9 @@
     notify(zope.app.appsetup.interfaces.ProcessStarting())
     return db
 
-def setupApplication(config=None):
+def setupApplication():
     # waargh
     sys.argv = []
-    # XXX get load_option args from apache conf?
     db = setup(load_options())
     return WSGIPublisherApplication(db)