@@ -43,30 +43,32 @@ def fixups(models, _SESSION):
opts.append(('auth_plugins', plugins, 'list'),)
opts.append(('auth_internal_enabled', 'True', 'bool'))
for name, default, type_ in opts:
setting = models.Setting.get_by_name(name)
if not setting:
# if we don't have this option create it
setting = models.Setting(name, default, type_)
_SESSION().add(setting)
_SESSION().commit()
#copy over the LDAP settings
old_ldap = [('ldap_active', 'false', 'bool'), ('ldap_host', '', 'unicode'),
('ldap_port', '389', 'int'), ('ldap_tls_kind', 'PLAIN', 'unicode'),
('ldap_tls_reqcert', '', 'unicode'), ('ldap_dn_user', '', 'unicode'),
('ldap_dn_pass', '', 'unicode'), ('ldap_base_dn', '', 'unicode'),
('ldap_filter', '', 'unicode'), ('ldap_search_scope', '', 'unicode'),
('ldap_attr_login', '', 'unicode'), ('ldap_attr_firstname', '', 'unicode'),
('ldap_attr_lastname', '', 'unicode'), ('ldap_attr_email', '', 'unicode')]
for k, v, t in old_ldap:
old_setting = models.Setting.get_by_name(k)
name = 'auth_%s' % k
if setting is None:
setting = models.Setting(name, old_setting.app_settings_value, t)
if old_setting is not None:
v = old_setting.app_settings_value
setting = models.Setting(name, v, t)
Status change: