Update of /cvsroot/mailman/mailman3/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30236
Modified Files:
webserver
Log Message:
Use the mailman.conf file.
Index: webserver
===================================================================
RCS file: /cvsroot/mailman/mailman3/bin/webserver,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -d -r3.1 -r3.2
--- webserver 20 Apr 2004 01:16:18 -0000 3.1
+++ webserver 21 Apr 2004 03:31:35 -0000 3.2
@@ -59,7 +59,7 @@
if opts.configfile is None:
here = os.path.abspath(os.path.dirname(__file__))
parent = os.path.normpath(os.path.join(here, '../etc'))
- cfile = os.path.join(parent, 'webserver.conf')
+ cfile = os.path.join(parent, 'mailman.conf')
if os.path.exists(cfile):
opts.configfile = os.path.abspath(cfile)
else:
@@ -142,10 +142,10 @@
if __name__ == '__main__':
options, parser = parseargs()
- configuration.configure('webserver', options.configfile)
- startup.startup()
- try:
- log = logging.getLogger('mailman.error')
- main()
- finally:
- startup.shutdown()
+ configuration.configure(options.configfile)
+ if configuration.webserver.enable:
+ try:
+ log = logging.getLogger('mailman.error')
+ main()
+ finally:
+ startup.shutdown()
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
