changeset 3746:510db268574b

make mail settings group
author Johannes Berg <johannes AT sipsolutions DOT net>
date Sun, 22 Jun 2008 00:10:31 +0200
parents 08dd5b1a1f1c
children c280acec2aaa
files MoinMoin/config/multiconfig.py
diffstat 1 files changed, 16 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Sun Jun 22 00:05:08 2008 +0200
+++ b/MoinMoin/config/multiconfig.py	Sun Jun 22 00:10:31 2008 +0200
@@ -736,18 +736,6 @@
     ('log_reverse_dns_lookups', True, None),
     ('log_timing', False, None),
 
-    ('mail_from', None, None),
-    ('mail_login', None, None),
-    ('mail_smarthost', None, None),
-    ('mail_sendmail', None, None),
-
-    ('mail_import_secret', "", None),
-    ('mail_import_subpage_template', u"$from-$date-$subject", None),
-    ('mail_import_pagename_search', ['subject', 'to', ], None),
-    ('mail_import_pagename_envelope', u"%s", None),
-    ('mail_import_pagename_regex', r'\[\[([^\]]*)\]\]', None),
-    ('mail_import_wiki_addrs', [], None),
-
     # some dangerous mimetypes (we don't use "content-disposition: inline" for them when a user
     # downloads such attachments, because the browser might execute e.g. Javascript contained
     # in the HTML and steal your moin session cookie or do other nasty stuff)
@@ -1071,6 +1059,22 @@
       ('restricted_users_group', None, None),
       ('enable_user', False, None),
     )),
+
+    'mail': ('Mail settings',
+        'These settings control outgoing and incoming email from and to the wiki.',
+    (
+      ('from', None, None),
+      ('login', None, None),
+      ('smarthost', None, None),
+      ('sendmail', None, None),
+
+      ('import_secret', "", None),
+      ('import_subpage_template', u"$from-$date-$subject", None),
+      ('import_pagename_search', ['subject', 'to', ], None),
+      ('import_pagename_envelope', u"%s", None),
+      ('import_pagename_regex', r'\[\[([^\]]*)\]\]', None),
+      ('import_wiki_addrs', [], None),
+    )),
 }
 
 def _add_options_to_defconfig(opts, addgroup=True):