diff options
| -rw-r--r-- | Mailman/MailList.py | 8 | ||||
| -rw-r--r-- | modules/maillist.py | 8 | ||||
| -rw-r--r-- | modules/mm_cfg.py | 34 |
3 files changed, 14 insertions, 36 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 807e17eb3..5a50b7593 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -4,9 +4,15 @@ # list once, but it sucked hard, because you'd see the footer 100 # times in each digest. +try: + import mm_cfg +except ImportError: + raise RuntimeError, ('missing mm_cfg - has mm_cfg_dist been configured ' + 'for the site?') + import sys, os, marshal, string, posixfile, time import re -import mm_cfg, mm_utils, mm_err +import mm_utils, mm_err from mm_admin import ListAdmin from mm_deliver import Deliverer diff --git a/modules/maillist.py b/modules/maillist.py index 807e17eb3..5a50b7593 100644 --- a/modules/maillist.py +++ b/modules/maillist.py @@ -4,9 +4,15 @@ # list once, but it sucked hard, because you'd see the footer 100 # times in each digest. +try: + import mm_cfg +except ImportError: + raise RuntimeError, ('missing mm_cfg - has mm_cfg_dist been configured ' + 'for the site?') + import sys, os, marshal, string, posixfile, time import re -import mm_cfg, mm_utils, mm_err +import mm_utils, mm_err from mm_admin import ListAdmin from mm_deliver import Deliverer diff --git a/modules/mm_cfg.py b/modules/mm_cfg.py deleted file mode 100644 index 0a82e7706..000000000 --- a/modules/mm_cfg.py +++ /dev/null @@ -1,34 +0,0 @@ -"""This is the module which take your site-specific settings. - -From a raw distribution it should be moved to be named mm_cfg.py. If you -already have an mm_cfg.py, be careful to add in only the new settings you -want. The complete set of distributed defaults are in ./mm_defaults. In -mm_cfg, override only those you want to change, after the - - from mm_defaults import * - -line, below. - -Note that these are just default settings - many can be overridden via the -admin and user interfaces on a per-list or per-user basis. - -Note also that some of the settings are resolved against the active list -setting by using the value as a format string against the -list-instance-object's dictionary - see the distributed value of -DEFAULT_MSG_FOOTER for an example.""" - -from mm_defaults import * - -####################################################### -# Put your site specific configurations below here. # - -DEFAULT_HOST_NAME = 'python.org' -SENDMAIL_CMD = '/usr/lib/sendmail -f %s %s' -DEFAULT_URL = 'http://www.python.org/mailman' -ARCHIVE_URL = 'http://www.python.org/~mailman/archives' -# Once we know our home directory we can figure out the rest. -HOME_DIR = '/home/mailman' -MAILMAN_DIR = '/home/mailman/mailman' - -# Subscription list restricted to list members until we finish spider hider. -DEFAULT_CLOSED = 1 |