mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-23 11:53:12 +00:00
Use django-ldapdb 1.3.0
This commit is contained in:
parent
50282d67b1
commit
cc6e1729dc
7 changed files with 99 additions and 29 deletions
|
@ -19,3 +19,4 @@ fonts-font-awesome
|
||||||
graphviz
|
graphviz
|
||||||
git
|
git
|
||||||
gettext
|
gettext
|
||||||
|
python3-django-ldapdb
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
django-bootstrap3
|
django-bootstrap3
|
||||||
django-ldapdb==0.9.0
|
|
||||||
django-macaddress
|
django-macaddress
|
||||||
|
|
|
@ -34,10 +34,17 @@ class Migration(migrations.Migration):
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.AddField(
|
migrations.SeparateDatabaseAndState(
|
||||||
model_name='ldapuser',
|
state_operations=[
|
||||||
name='sambaSID',
|
migrations.AddField(
|
||||||
field=ldapdb.models.fields.IntegerField(db_column='sambaSID', unique=True, null=True),
|
model_name='ldapuser',
|
||||||
preserve_default=False,
|
name='sambaSID',
|
||||||
),
|
field=ldapdb.models.fields.IntegerField(db_column='sambaSID', unique=True, null=True),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
database_operations=[
|
||||||
|
migrations.RunSQL('ALTER TABLE `users_ldapuser` ADD COLUMN `sambaSID` integer NULL UNIQUE;'),
|
||||||
|
],
|
||||||
|
)
|
||||||
]
|
]
|
||||||
|
|
|
@ -35,26 +35,35 @@ class Migration(migrations.Migration):
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.AddField(
|
migrations.SeparateDatabaseAndState(
|
||||||
model_name='ldapuser',
|
state_operations=[
|
||||||
name='display_name',
|
migrations.AddField(
|
||||||
field=ldapdb.models.fields.CharField(null=True, blank=True, max_length=200, db_column='displayName'),
|
model_name='ldapuser',
|
||||||
|
name='display_name',
|
||||||
|
field=ldapdb.models.fields.CharField(null=True, blank=True, max_length=200, db_column='displayName'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='ldapuser',
|
||||||
|
name='sambat_nt_password',
|
||||||
|
field=ldapdb.models.fields.CharField(null=True, blank=True, max_length=200, db_column='sambaNTPassword'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='ldapuser',
|
||||||
|
name='user_password',
|
||||||
|
field=ldapdb.models.fields.CharField(null=True, blank=True, max_length=200, db_column='userPassword'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
database_operations=[
|
||||||
|
migrations.RunSQL('ALTER TABLE `users_ldapuser` ADD COLUMN `displayName` varchar(200) NULL;'),
|
||||||
|
migrations.RunSQL('ALTER TABLE `users_ldapuser` ADD COLUMN `sambaNTPassword` varchar(200) NULL;'),
|
||||||
|
migrations.RunSQL('ALTER TABLE `users_ldapuser` ADD COLUMN `userPassword` varchar(200) NULL;'),
|
||||||
|
]
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='ldapuser',
|
model_name='ldapuser',
|
||||||
name='macs',
|
name='macs',
|
||||||
field=ldapdb.models.fields.ListField(null=True, blank=True, max_length=200, db_column='radiusCallingStationId'),
|
field=ldapdb.models.fields.ListField(null=True, blank=True, max_length=200, db_column='radiusCallingStationId'),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
|
||||||
model_name='ldapuser',
|
|
||||||
name='sambat_nt_password',
|
|
||||||
field=ldapdb.models.fields.CharField(null=True, blank=True, max_length=200, db_column='sambaNTPassword'),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='ldapuser',
|
|
||||||
name='user_password',
|
|
||||||
field=ldapdb.models.fields.CharField(null=True, blank=True, max_length=200, db_column='userPassword'),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='listright',
|
model_name='listright',
|
||||||
name='gid',
|
name='gid',
|
||||||
|
|
|
@ -36,10 +36,17 @@ class Migration(migrations.Migration):
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.AddField(
|
migrations.SeparateDatabaseAndState(
|
||||||
model_name='ldapuser',
|
state_operations=[
|
||||||
name='login_shell',
|
migrations.AddField(
|
||||||
field=ldapdb.models.fields.CharField(blank=True, db_column='loginShell', max_length=200, null=True),
|
model_name='ldapuser',
|
||||||
|
name='login_shell',
|
||||||
|
field=ldapdb.models.fields.CharField(blank=True, db_column='loginShell', max_length=200, null=True),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
database_operations=[
|
||||||
|
migrations.RunSQL('ALTER TABLE `users_ldapuser` ADD COLUMN `loginShell` varchar(200) NULL;')
|
||||||
|
],
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='user',
|
model_name='user',
|
||||||
|
|
|
@ -13,9 +13,16 @@ class Migration(migrations.Migration):
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.AddField(
|
migrations.SeparateDatabaseAndState(
|
||||||
model_name='ldapuser',
|
state_operations=[
|
||||||
name='shadowexpire',
|
migrations.AddField(
|
||||||
field=ldapdb.models.fields.CharField(blank=True, db_column='shadowExpire', max_length=200, null=True),
|
model_name='ldapuser',
|
||||||
|
name='shadowexpire',
|
||||||
|
field=ldapdb.models.fields.CharField(blank=True, db_column='shadowExpire', max_length=200, null=True),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
database_operations=[
|
||||||
|
migrations.RunSQL('ALTER TABLE `users_ldapuser` ADD COLUMN `shadowExpire` varchar(200) NULL;'),
|
||||||
|
]
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
40
users/migrations/0082_auto_20190908_1338.py
Normal file
40
users/migrations/0082_auto_20190908_1338.py
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.11.23 on 2019-09-08 11:38
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
import ldapdb.models.fields
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('users', '0081_auto_20190317_0302'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.SeparateDatabaseAndState(
|
||||||
|
state_operations=[
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='ldapserviceuser',
|
||||||
|
name='dn',
|
||||||
|
field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='ldapserviceusergroup',
|
||||||
|
name='dn',
|
||||||
|
field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='ldapuser',
|
||||||
|
name='dn',
|
||||||
|
field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='ldapusergroup',
|
||||||
|
name='dn',
|
||||||
|
field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)
|
||||||
|
]
|
Loading…
Reference in a new issue