github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

merge: with rmote

pull/9008/head
ibuler 2022-10-31 11:22:47 +08:00
parent d123c7f105 a11770e96d
commit db07cadd6e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/assets/automations/base/manager.py
View File

@ -21,6 +21,7 @@ logger = get_logger(__name__)
class PushOrVerifyHostCallbackMixin: class PushOrVerifyHostCallbackMixin:
execution: callable
host_account_mapper: dict host_account_mapper: dict
ignore_account: bool ignore_account: bool
generate_public_key: callable generate_public_key: callable

4
apps/assets/migrations/0107_auto_20221019_1115.py
View File

@ -111,7 +111,7 @@ class Migration(migrations.Migration):
('baseautomation_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='assets.baseautomation')), ('baseautomation_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='assets.baseautomation')),
], ],
options={ options={
'verbose_name': 'Push automation', 'verbose_name': 'Push asset account',
}, },
bases=('assets.baseautomation',), bases=('assets.baseautomation',),
), ),
@ -121,7 +121,7 @@ class Migration(migrations.Migration):
('baseautomation_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='assets.baseautomation')), ('baseautomation_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='assets.baseautomation')),
], ],
options={ options={
'verbose_name': 'Verify account automation', 'verbose_name': 'Verify asset account',
}, },
bases=('assets.baseautomation',), bases=('assets.baseautomation',),
), ),