github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-24 22:12:00 +00:00
Code Issues Projects Releases Wiki Activity

perf: settings 删掉 windows default shell

Browse Source
This commit is contained in:
ibuler 2023-02-17 15:39:59 +08:00 committed by Jiangjie.Bai
parent 98355ce468
commit 3cc22f8524
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/jumpserver/conf.py
View File

@ -527,7 +527,6 @@ class Config(dict):
'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False, 'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False,
'TICKET_AUTHORIZE_DEFAULT_TIME': 7, 'TICKET_AUTHORIZE_DEFAULT_TIME': 7,
'TICKET_AUTHORIZE_DEFAULT_TIME_UNIT': 'day', 'TICKET_AUTHORIZE_DEFAULT_TIME_UNIT': 'day',
'WINDOWS_SSH_DEFAULT_SHELL': 'cmd',
'PERIOD_TASK_ENABLED': True, 'PERIOD_TASK_ENABLED': True,
# 导航栏 帮助 # 导航栏 帮助

1
apps/jumpserver/settings/custom.py
View File

@ -92,7 +92,6 @@ PERM_SINGLE_ASSET_TO_UNGROUP_NODE = CONFIG.PERM_SINGLE_ASSET_TO_UNGROUP_NODE
TICKET_AUTHORIZE_DEFAULT_TIME = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME TICKET_AUTHORIZE_DEFAULT_TIME = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME
TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME_UNIT TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME_UNIT
PERM_EXPIRED_CHECK_PERIODIC = CONFIG.PERM_EXPIRED_CHECK_PERIODIC PERM_EXPIRED_CHECK_PERIODIC = CONFIG.PERM_EXPIRED_CHECK_PERIODIC
WINDOWS_SSH_DEFAULT_SHELL = CONFIG.WINDOWS_SSH_DEFAULT_SHELL
FLOWER_URL = CONFIG.FLOWER_URL FLOWER_URL = CONFIG.FLOWER_URL
# Enable internal period task # Enable internal period task

2
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -4454,7 +4454,7 @@ msgstr "云同步记录"
#: settings/serializers/cleaning.py:31 #: settings/serializers/cleaning.py:31
msgid "Session keep duration" msgid "Session keep duration"
msgstr "资产会话日志" msgstr "会话日志"
#: settings/serializers/cleaning.py:32 #: settings/serializers/cleaning.py:32
msgid "" msgid ""

9
apps/settings/serializers/other.py
View File

@ -18,15 +18,6 @@ class OtherSettingSerializer(serializers.Serializer):
label=_("OTP valid window") label=_("OTP valid window")
) )
WINDOWS_SSH_DEFAULT_SHELL = serializers.ChoiceField(
choices=[
('cmd', _("CMD")),
('powershell', _("PowerShell"))
],
label=_('Shell (Windows)'),
help_text=_('The shell type used when Windows assets perform ansible tasks')
)
PERM_SINGLE_ASSET_TO_UNGROUP_NODE = serializers.BooleanField( PERM_SINGLE_ASSET_TO_UNGROUP_NODE = serializers.BooleanField(
required=False, label=_("Perm ungroup node"), required=False, label=_("Perm ungroup node"),
help_text=_("Perm single to ungroup node") help_text=_("Perm single to ungroup node")