From a555edbb0dabd3cc0dee5716285dff1c042bd79e Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Thu, 20 Nov 2008 20:10:05 +0100 Subject: [PATCH] Replace wipi.fcgi with the clean 1.8 version. --- wipi.fcgi | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/wipi.fcgi b/wipi.fcgi index 07234d2..9146291 100755 --- a/wipi.fcgi +++ b/wipi.fcgi @@ -3,34 +3,39 @@ """ MoinMoin - FastCGI Driver Script - @copyright: 2007 MoinMoin:ThomasWaldmann + @copyright: 2008 MoinMoin:ThomasWaldmann @license: GNU GPL, see COPYING for details. """ -import sys, logging +import sys, os -# Path to MoinMoin package, needed if you installed with --prefix=PREFIX -# or if you did not use setup.py. +# a) Configuration of Python's code search path +# If you already have set up the PYTHONPATH environment variable for the +# stuff you see below, you don't need to do a1) and a2). + +# a1) Path of the directory where the MoinMoin code package is located. +# Needed if you installed with --prefix=PREFIX or you didn't use setup.py. #sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages') -# Path of the directory where wikiconfig.py is located. -# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP. +# a2) Path of the directory where wikiconfig.py / farmconfig.py is located. +# See wiki/config/... for some sample config files. #sys.path.insert(0, '/etc/moin') +sys.path.insert(0, '/etc/moin') -import os -# Path of the directory where farmconfig is located (if different). -sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'conf')) +# b) Configuration of moin's logging +# If you have set up MOINLOGGINGCONF environment variable, you don't need this! +# You also don't need this if you are happy with the builtin defaults. +# See wiki/config/logging/... for some sample config files. +#from MoinMoin import log +#log.load_config('/path/to/logging_configuration_file') # Debug mode - show detailed error reports -#import os #os.environ['MOIN_DEBUG'] = '1' + from MoinMoin.server.server_fastcgi import FastCgiConfig, run class Config(FastCgiConfig): - #loglevel_file = logging.DEBUG # adapt if you don't like the default - logPath = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir, 'logs', 'wipi.log') - properties = {} # properties = {'script_name': '/'} # use this instead of the line above if your wiki runs under "/" url -- 2.30.2