clean migrations

guohongze · May 10, 2019 · 5cfd435 · 5cfd435
1 parent b5fb4b7
commit 5cfd435
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 225 deletions.
diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.9 on 2018-03-20 18:02
+# Generated by Django 1.11.20 on 2019-04-18 05:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,6 +11,8 @@ class Migration(migrations.Migration):
  initial = True
 
  dependencies = [
+ ('cmdb', '0001_initial'),
+ ('appconf', '0001_initial'),
  ]
 
  operations = [
@@ -24,7 +26,8 @@ class Migration(migrations.Migration):
  ('email', models.EmailField(max_length=255)),
  ('is_active', models.BooleanField(default=False)),
  ('is_superuser', models.BooleanField(default=False)),
- ('nickname', models.CharField(max_length=64, null=True)),
+ ('nickname', models.CharField(blank=True, max_length=64, null=True)),
+ ('ldap_name', models.CharField(blank=True, max_length=64)),
  ],
  options={
  'abstract': False,
@@ -43,7 +46,9 @@ class Migration(migrations.Migration):
  fields=[
  ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  ('name', models.CharField(max_length=64)),
+ ('delivery', models.ManyToManyField(blank=True, to='appconf.Project')),
  ('permission', models.ManyToManyField(blank=True, to='accounts.PermissionList')),
+ ('webssh', models.ManyToManyField(blank=True, to='cmdb.HostGroup')),
  ],
  ),
  migrations.AddField(

diff --git a/accounts/migrations/0002_auto_20180827_1725.py b/accounts/migrations/0002_auto_20180827_1725.py
diff --git a/accounts/migrations/0003_auto_20190313_1047.py b/accounts/migrations/0003_auto_20190313_1047.py
diff --git a/appconf/migrations/0001_initial.py b/appconf/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.9 on 2018-03-20 18:02
+# Generated by Django 1.11.20 on 2019-04-18 05:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,7 +11,6 @@ class Migration(migrations.Migration):
  initial = True
 
  dependencies = [
- ('cmdb', '0001_initial'),
  ]
 
  operations = [
@@ -32,7 +31,8 @@ class Migration(migrations.Migration):
  ('dis_name', models.CharField(max_length=50, unique=True, verbose_name='\u8ba4\u8bc1\u6807\u8bc6')),
  ('username', models.CharField(blank=True, max_length=50, verbose_name='\u7528\u6237\u540d')),
  ('password', models.CharField(blank=True, max_length=50, verbose_name='\u5bc6\u7801')),
- ('private_key', models.CharField(blank=True, max_length=100, verbose_name='\u5bc6\u94a5')),
+ ('deploy_port', models.IntegerField(default=22, verbose_name='\u7aef\u53e3')),
+ ('private_key', models.CharField(blank=True, max_length=2048, verbose_name='\u5bc6\u94a5')),
  ('memo', models.TextField(blank=True, max_length=200, verbose_name='\u5907\u6ce8\u4fe1\u606f')),
  ],
  ),
@@ -61,7 +61,6 @@ class Migration(migrations.Migration):
  ('configPath', models.CharField(blank=True, max_length=255, null=True, verbose_name='\u914d\u7f6e\u6587\u4ef6\u8def\u5f84')),
  ('owner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='appconf.AppOwner', verbose_name='\u9879\u76ee\u8d1f\u8d23\u4eba')),
  ('product', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='appconf.Product', verbose_name='\u6240\u5c5e\u4ea7\u54c1\u7ebf')),
- ('serverList', models.ManyToManyField(blank=True, to='cmdb.Host', verbose_name='\u6240\u5728\u670d\u52a1\u5668')),
  ],
  ),
  ]
diff --git a/appconf/migrations/0002_authinfo_deploy_port.py b/appconf/migrations/0002_authinfo_deploy_port.py
diff --git a/appconf/migrations/0003_remove_project_serverlist.py b/appconf/migrations/0003_remove_project_serverlist.py
diff --git a/appconf/migrations/0004_auto_20190313_1047.py b/appconf/migrations/0004_auto_20190313_1047.py
diff --git a/branches/migrations/0001_initial.py b/branches/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-12-26 02:21
+# Generated by Django 1.11.20 on 2019-04-18 05:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
  initial = True
 
  dependencies = [
- ('appconf', '0002_authinfo_deploy_port'),
+ ('appconf', '0001_initial'),
  ]
 
  operations = [

diff --git a/cmdb/migrations/0001_initial.py b/cmdb/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.9 on 2018-03-20 18:02
+# Generated by Django 1.11.20 on 2019-04-18 05:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,6 +11,7 @@ class Migration(migrations.Migration):
  initial = True
 
  dependencies = [
+ ('appconf', '0001_initial'),
  ]
 
  operations = [
@@ -42,6 +43,7 @@ class Migration(migrations.Migration):
  ('sn', models.CharField(blank=True, max_length=60, verbose_name='SN\u53f7 \u7801')),
  ('position', models.CharField(blank=True, max_length=100, verbose_name='\u6240\u5728\u4f4d\u7f6e')),
  ('memo', models.TextField(blank=True, max_length=200, verbose_name='\u5907\u6ce8\u4fe1\u606f')),
+ ('account', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='appconf.AuthInfo', verbose_name='\u8d26\u53f7\u4fe1\u606f')),
  ],
  ),
  migrations.CreateModel(

diff --git a/cmdb/migrations/0002_host_account.py b/cmdb/migrations/0002_host_account.py
diff --git a/delivery/migrations/0001_initial.py b/delivery/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.9 on 2018-03-20 18:02
+# Generated by Django 1.11.20 on 2019-04-18 05:56
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -11,6 +11,7 @@ class Migration(migrations.Migration):
  initial = True
 
  dependencies = [
+ ('cmdb', '0001_initial'),
  ('appconf', '0001_initial'),
  ]
 
@@ -23,13 +24,16 @@ class Migration(migrations.Migration):
  ('deploy_policy', models.CharField(choices=[('Direct', 'Direct')], max_length=255, verbose_name='\u90e8\u7f72\u7b56\u7565')),
  ('version', models.CharField(blank=True, max_length=255, verbose_name='\u7248\u672c\u4fe1\u606f')),
  ('build_clean', models.BooleanField(default=False, verbose_name='\u6e05\u7406\u6784\u5efa')),
- ('shell', models.CharField(blank=True, max_length=255, verbose_name='shell')),
+ ('rsync_delete', models.BooleanField(default=True, verbose_name='\u540c\u6b65\u5220\u9664')),
+ ('shell', models.CharField(blank=True, max_length=2048, verbose_name='shell')),
  ('shell_position', models.BooleanField(default=False, verbose_name='\u672c\u5730\u6267\u884c')),
  ('status', models.BooleanField(default=False, verbose_name='\u90e8\u7f72\u72b6\u6001')),
  ('deploy_num', models.IntegerField(default=0, verbose_name='\u90e8\u7f72\u6b21\u6570')),
  ('bar_data', models.IntegerField(default=0)),
+ ('source_auth', models.BooleanField(default=False, verbose_name='\u6e90\u7801\u8ba4\u8bc1')),
  ('auth', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='appconf.AuthInfo', verbose_name='\u8ba4\u8bc1\u4fe1\u606f')),
  ('job_name', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='appconf.Project', verbose_name='\u9879\u76ee\u540d')),
+ ('serverList', models.ManyToManyField(blank=True, to='cmdb.Host', verbose_name='\u6240\u5728\u670d\u52a1\u5668')),
  ],
  ),
  ]
diff --git a/delivery/migrations/0002_delivery_rsync_delete.py b/delivery/migrations/0002_delivery_rsync_delete.py
diff --git a/delivery/migrations/0003_delivery_source_auth.py b/delivery/migrations/0003_delivery_source_auth.py
diff --git a/delivery/migrations/0004_delivery_serverlist.py b/delivery/migrations/0004_delivery_serverlist.py
diff --git a/delivery/migrations/0005_auto_20190313_1047.py b/delivery/migrations/0005_auto_20190313_1047.py