From 88bb620af2996d7c5afe91c29bfa3887f655b30f Mon Sep 17 00:00:00 2001 From: ibuler Date: Sat, 24 Sep 2016 11:50:25 +0800 Subject: [PATCH] Modify ignore --- .gitignore | 2 +- apps/assets/migrations/0001_initial.py | 194 ++++++++++++++++++ apps/assets/migrations/__init__.py | 0 apps/perms/migrations/0001_initial.py | 37 ++++ .../migrations/0002_auto_20160924_1014.py | 30 +++ apps/perms/migrations/__init__.py | 0 apps/users/migrations/0001_initial.py | 78 +++++++ apps/users/migrations/__init__.py | 0 8 files changed, 340 insertions(+), 1 deletion(-) create mode 100644 apps/assets/migrations/0001_initial.py create mode 100644 apps/assets/migrations/__init__.py create mode 100644 apps/perms/migrations/0001_initial.py create mode 100644 apps/perms/migrations/0002_auto_20160924_1014.py create mode 100644 apps/perms/migrations/__init__.py create mode 100644 apps/users/migrations/0001_initial.py create mode 100644 apps/users/migrations/__init__.py diff --git a/.gitignore b/.gitignore index 56517e210..99fb9cd47 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,5 @@ _mailinglist .idea/ db.sqlite3 config.py -migrations/0* +migrations/0*.py *.log diff --git a/apps/assets/migrations/0001_initial.py b/apps/assets/migrations/0001_initial.py new file mode 100644 index 000000000..7ba43c7f3 --- /dev/null +++ b/apps/assets/migrations/0001_initial.py @@ -0,0 +1,194 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-24 02:14 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='AdminUser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), + ('username', models.CharField(max_length=16, verbose_name='Username')), + ('_password', models.CharField(blank=True, max_length=256, verbose_name='Password')), + ('_private_key', models.CharField(blank=True, max_length=4096, verbose_name='SSH private key')), + ('_public_key', models.CharField(blank=True, max_length=4096, verbose_name='SSH public key')), + ('as_default', models.BooleanField(default=False, verbose_name='As default')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), + ('date_created', models.DateTimeField(auto_now=True, null=True)), + ('created_by', models.CharField(max_length=32, null=True, verbose_name='Created by')), + ], + options={ + 'db_table': 'admin_user', + }, + ), + migrations.CreateModel( + name='Asset', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ip', models.GenericIPAddressField(verbose_name='IP')), + ('other_ip', models.CharField(blank=True, max_length=255, null=True, verbose_name='Other IP')), + ('remote_card_ip', models.CharField(blank=True, max_length=16, null=True, verbose_name='Remote card IP')), + ('hostname', models.CharField(blank=True, max_length=128, verbose_name='Hostname')), + ('port', models.IntegerField(default=22, verbose_name='Port')), + ('mac_address', models.CharField(blank=True, max_length=20, null=True, verbose_name='Mac address')), + ('brand', models.CharField(blank=True, max_length=64, null=True, verbose_name='Brand')), + ('cpu', models.CharField(blank=True, max_length=64, null=True, verbose_name='CPU')), + ('memory', models.CharField(blank=True, max_length=128, null=True, verbose_name='Memory')), + ('disk', models.CharField(blank=True, max_length=1024, null=True, verbose_name='Disk')), + ('os', models.CharField(blank=True, max_length=128, null=True, verbose_name='OS')), + ('cabinet_no', models.CharField(blank=True, max_length=32, null=True, verbose_name='Cabinet number')), + ('cabinet_pos', models.IntegerField(blank=True, null=True, verbose_name='Cabinet position')), + ('number', models.CharField(blank=True, max_length=32, null=True, verbose_name='Asset number')), + ('sn', models.CharField(blank=True, max_length=128, null=True, verbose_name='Serial number')), + ('created_by', models.CharField(blank=True, max_length=32, null=True, verbose_name='Created by')), + ('is_active', models.BooleanField(default=True, verbose_name='Is active')), + ('date_created', models.DateTimeField(auto_now=True, null=True, verbose_name='Date added')), + ('comment', models.TextField(blank=True, max_length=128, null=True, verbose_name='Comment')), + ('admin_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assets', to='assets.AdminUser', verbose_name='Admin user')), + ], + options={ + 'db_table': 'asset', + }, + ), + migrations.CreateModel( + name='AssetExtend', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('key', models.CharField(max_length=64, verbose_name='KEY')), + ('value', models.CharField(max_length=64, verbose_name='VALUE')), + ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('date_created', models.DateTimeField(auto_now=True, null=True)), + ('comment', models.TextField(blank=True, verbose_name='Comment')), + ], + options={ + 'db_table': 'asset_extend', + }, + ), + migrations.CreateModel( + name='AssetGroup', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64, unique=True, verbose_name='Name')), + ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('date_created', models.DateTimeField(auto_now=True, null=True, verbose_name='Date added')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), + ], + options={ + 'db_table': 'asset_group', + }, + ), + migrations.CreateModel( + name='IDC', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=32, verbose_name='Name')), + ('bandwidth', models.CharField(blank=True, max_length=32, verbose_name='Bandwidth')), + ('contact', models.CharField(blank=True, max_length=16, verbose_name='Contact')), + ('phone', models.CharField(blank=True, max_length=32, verbose_name='Phone')), + ('address', models.CharField(blank=True, max_length=128, verbose_name='Address')), + ('intranet', models.TextField(blank=True, verbose_name='Intranet')), + ('extranet', models.TextField(blank=True, verbose_name='Extranet')), + ('date_created', models.DateTimeField(auto_now=True, null=True, verbose_name='Date added')), + ('operator', models.CharField(blank=True, max_length=32, verbose_name='Operator')), + ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), + ], + options={ + 'db_table': 'idc', + }, + ), + migrations.CreateModel( + name='SystemUser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), + ('username', models.CharField(max_length=16, verbose_name='Username')), + ('_password', models.CharField(blank=True, max_length=256, verbose_name='Password')), + ('protocol', models.CharField(choices=[('ssh', 'ssh')], default='ssh', max_length=16, verbose_name='Protocol')), + ('_private_key', models.CharField(blank=True, max_length=4096, verbose_name='SSH private key')), + ('_public_key', models.CharField(blank=True, max_length=4096, verbose_name='SSH public key')), + ('as_default', models.BooleanField(default=False, verbose_name='As default')), + ('auto_push', models.BooleanField(default=True, verbose_name='Auto push')), + ('auto_update', models.BooleanField(default=True, verbose_name='Auto update pass/key')), + ('sudo', models.TextField(default='/user/bin/whoami', max_length=4096, verbose_name='Sudo')), + ('shell', models.CharField(default='/bin/bash', max_length=64, verbose_name='Shell')), + ('home', models.CharField(blank=True, max_length=64, verbose_name='Home')), + ('uid', models.IntegerField(blank=True, null=True, verbose_name='Uid')), + ('date_created', models.DateTimeField(auto_now=True)), + ('created_by', models.CharField(blank=True, max_length=32, verbose_name='Created by')), + ('comment', models.TextField(blank=True, max_length=128, verbose_name='Comment')), + ], + options={ + 'db_table': 'system_user', + }, + ), + migrations.CreateModel( + name='Tag', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.CharField(max_length=64, verbose_name='VALUE')), + ('asset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tags', to='assets.Asset', verbose_name='Asset')), + ], + options={ + 'db_table': 'tag', + }, + ), + migrations.AddField( + model_name='assetgroup', + name='system_users', + field=models.ManyToManyField(blank=True, related_name='asset_groups', to='assets.SystemUser'), + ), + migrations.AlterUniqueTogether( + name='assetextend', + unique_together=set([('key', 'value')]), + ), + migrations.AddField( + model_name='asset', + name='env', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='env_asset', to='assets.AssetExtend', verbose_name='Asset environment'), + ), + migrations.AddField( + model_name='asset', + name='groups', + field=models.ManyToManyField(blank=True, related_name='assets', to='assets.AssetGroup', verbose_name='Asset groups'), + ), + migrations.AddField( + model_name='asset', + name='idc', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assets', to='assets.IDC', verbose_name='IDC'), + ), + migrations.AddField( + model_name='asset', + name='status', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='status_asset', to='assets.AssetExtend', verbose_name='Asset status'), + ), + migrations.AddField( + model_name='asset', + name='system_users', + field=models.ManyToManyField(blank=True, related_name='assets', to='assets.SystemUser', verbose_name='System User'), + ), + migrations.AddField( + model_name='asset', + name='type', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='type_asset', to='assets.AssetExtend', verbose_name='Asset type'), + ), + migrations.AlterUniqueTogether( + name='tag', + unique_together=set([('value', 'asset')]), + ), + migrations.AlterUniqueTogether( + name='asset', + unique_together=set([('ip', 'port')]), + ), + ] diff --git a/apps/assets/migrations/__init__.py b/apps/assets/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/perms/migrations/0001_initial.py b/apps/perms/migrations/0001_initial.py new file mode 100644 index 000000000..388e7dae2 --- /dev/null +++ b/apps/perms/migrations/0001_initial.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-24 02:14 +from __future__ import unicode_literals + +import common.utils +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('assets', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='AssetPermission', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')), + ('private_for', models.CharField(blank=True, choices=[('N', 'None'), ('U', 'user'), ('G', 'user group')], default='N', max_length=1, verbose_name='Private for')), + ('is_active', models.BooleanField(default=True, verbose_name='Active')), + ('date_expired', models.DateTimeField(default=common.utils.date_expired_default, verbose_name='Date expired')), + ('created_by', models.CharField(blank=True, max_length=128, verbose_name='Created by')), + ('date_created', models.DateTimeField(auto_now=True, verbose_name='Date created')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), + ('asset_groups', models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.AssetGroup')), + ('assets', models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.Asset')), + ('system_users', models.ManyToManyField(related_name='granted_by_permissions', to='assets.SystemUser')), + ], + options={ + 'db_table': 'asset_permission', + }, + ), + ] diff --git a/apps/perms/migrations/0002_auto_20160924_1014.py b/apps/perms/migrations/0002_auto_20160924_1014.py new file mode 100644 index 000000000..5f375215c --- /dev/null +++ b/apps/perms/migrations/0002_auto_20160924_1014.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-24 02:14 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('users', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('perms', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='assetpermission', + name='user_groups', + field=models.ManyToManyField(blank=True, related_name='asset_permissions', to='users.UserGroup'), + ), + migrations.AddField( + model_name='assetpermission', + name='users', + field=models.ManyToManyField(blank=True, related_name='asset_permissions', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/apps/perms/migrations/__init__.py b/apps/perms/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/users/migrations/0001_initial.py b/apps/users/migrations/0001_initial.py new file mode 100644 index 000000000..322ba9e4d --- /dev/null +++ b/apps/users/migrations/0001_initial.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-24 02:14 +from __future__ import unicode_literals + +import common.utils +import django.contrib.auth.models +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0008_alter_user_username_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('username', models.CharField(max_length=20, unique=True, verbose_name='Username')), + ('name', models.CharField(blank=True, max_length=20, verbose_name='Name')), + ('email', models.EmailField(max_length=30, unique=True, verbose_name='Email')), + ('role', models.CharField(blank=True, choices=[('Admin', 'Administrator'), ('User', 'User')], default='User', max_length=10, verbose_name='Role')), + ('avatar', models.ImageField(upload_to='avatar', verbose_name='Avatar')), + ('wechat', models.CharField(blank=True, max_length=30, verbose_name='Wechat')), + ('phone', models.CharField(blank=True, max_length=20, verbose_name='Phone')), + ('enable_otp', models.BooleanField(default=False, verbose_name='Enable OTP')), + ('secret_key_otp', models.CharField(blank=True, max_length=16)), + ('_private_key', models.CharField(blank=True, max_length=5000, verbose_name='ssh private key')), + ('_public_key', models.CharField(blank=True, max_length=1000, verbose_name='ssh public key')), + ('comment', models.TextField(blank=True, max_length=200, verbose_name='Comment')), + ('is_first_login', models.BooleanField(default=False)), + ('date_expired', models.DateTimeField(blank=True, default=common.utils.date_expired_default, null=True, verbose_name='Date expired')), + ('created_by', models.CharField(default='', max_length=30, verbose_name='Created by')), + ], + options={ + 'db_table': 'user', + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + migrations.CreateModel( + name='UserGroup', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('is_discard', models.BooleanField(default=False, verbose_name='is discard')), + ('discard_time', models.DateTimeField(blank=True, null=True, verbose_name='discard time')), + ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')), + ('comment', models.TextField(blank=True, verbose_name='Comment')), + ('date_created', models.DateTimeField(auto_now_add=True)), + ('created_by', models.CharField(max_length=100)), + ], + options={ + 'db_table': 'user_group', + }, + ), + migrations.AddField( + model_name='user', + name='groups', + field=models.ManyToManyField(blank=True, related_name='users', to='users.UserGroup', verbose_name='User group'), + ), + migrations.AddField( + model_name='user', + name='user_permissions', + field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'), + ), + ] diff --git a/apps/users/migrations/__init__.py b/apps/users/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb