102 ('domdir.base', 'misc.base_directory')): |
102 ('domdir.base', 'misc.base_directory')): |
103 move_option(cp, src, dst) |
103 move_option(cp, src, dst) |
104 cp.remove_section('domdir') |
104 cp.remove_section('domdir') |
105 if cp.has_section('services'): |
105 if cp.has_section('services'): |
106 for service in cp.options('services'): |
106 for service in cp.options('services'): |
107 move_option(cp, 'services.%s'%service, 'account.%s'%service) |
107 move_option(cp, 'services.%s' % service, 'domain.%s' % service) |
108 cp.remove_section('services') |
108 cp.remove_section('services') |
109 for src, dst in (('maildir.mode', 'account.directory_mode'), |
109 for src, dst in (('maildir.mode', 'account.directory_mode'), |
110 ('maildir.diskusage', 'account.disk_usage'), |
110 ('maildir.diskusage', 'account.disk_usage'), |
111 ('maildir.delete', 'account.delete_directory'), |
111 ('maildir.delete', 'account.delete_directory'), |
112 ('maildir.folders', 'mailbox.folders'), |
112 ('maildir.folders', 'mailbox.folders'), |
113 ('maildir.name', 'mailbox.root'), |
113 ('maildir.name', 'mailbox.root'), |
114 ('misc.forcedel', 'domain.force_deletion'), |
114 ('misc.forcedel', 'domain.force_deletion'), |
|
115 ('misc.transport', 'domain.transport'), |
115 ('misc.passwdscheme', 'misc.password_scheme'), |
116 ('misc.passwdscheme', 'misc.password_scheme'), |
116 ('misc.dovecotvers', 'misc.dovecot_version')): |
117 ('misc.dovecotvers', 'misc.dovecot_version')): |
117 move_option(cp, src, dst) |
118 move_option(cp, src, dst) |
118 cp.remove_section('maildir') |
119 cp.remove_section('maildir') |
119 if not has_psycopg2: |
120 if not has_psycopg2: |