diff --git a/apps/jumpserver/views.py b/apps/jumpserver/views.py index 06eb7feb5..f3365b7ff 100644 --- a/apps/jumpserver/views.py +++ b/apps/jumpserver/views.py @@ -190,7 +190,7 @@ class IndexView(PermissionsMixin, TemplateView): class LunaView(View): def get(self, request): - msg = _("
Luna is a separately deployed program, you need to deploy Luna, coco, configure nginx for url distribution,
" + msg = _("
Luna is a separately deployed program, you need to deploy Luna, koko, configure nginx for url distribution,
" "If you see this page, prove that you are not accessing the nginx listening port. Good luck.") return HttpResponse(msg) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 753a93327..0708229e9 100644 Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index fe241d0fc..b5e92d498 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-24 11:11+0800\n" +"POT-Creation-Date: 2019-09-25 14:29+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -620,7 +620,7 @@ msgid "Domain" msgstr "网域" #: assets/forms/asset.py:68 assets/forms/asset.py:103 assets/forms/asset.py:116 -#: assets/forms/asset.py:153 assets/models/node.py:403 +#: assets/forms/asset.py:153 assets/models/node.py:413 #: assets/templates/assets/asset_create.html:42 #: perms/forms/asset_permission.py:82 perms/forms/asset_permission.py:89 #: perms/templates/perms/asset_permission_list.html:53 @@ -1107,7 +1107,7 @@ msgstr "默认资产组" msgid "User" msgstr "用户" -#: assets/models/label.py:19 assets/models/node.py:394 +#: assets/models/label.py:19 assets/models/node.py:404 #: assets/templates/assets/label_list.html:15 settings/models.py:30 msgid "Value" msgstr "值" @@ -1116,19 +1116,19 @@ msgstr "值" msgid "Category" msgstr "分类" -#: assets/models/node.py:230 +#: assets/models/node.py:163 msgid "New node" msgstr "新节点" -#: assets/models/node.py:318 +#: assets/models/node.py:328 msgid "ungrouped" msgstr "未分组" -#: assets/models/node.py:320 +#: assets/models/node.py:330 msgid "empty" msgstr "空" -#: assets/models/node.py:393 +#: assets/models/node.py:403 msgid "Key" msgstr "键" @@ -1182,7 +1182,7 @@ msgstr "Shell" msgid "Login mode" msgstr "登录模式" -#: assets/models/user.py:168 assets/templates/assets/user_asset_list.html:52 +#: assets/models/user.py:162 assets/templates/assets/user_asset_list.html:52 #: audits/models.py:20 audits/templates/audits/ftp_log_list.html:52 #: audits/templates/audits/ftp_log_list.html:75 #: perms/forms/asset_permission.py:85 perms/forms/remote_app_permission.py:40 @@ -2733,13 +2733,12 @@ msgstr "仪表盘" #: jumpserver/views.py:193 msgid "" -"
Luna is a separately deployed program, you need to deploy Luna, coco, " +"
Luna is a separately deployed program, you need to deploy Luna, koko, " "configure nginx for url distribution,
If you see this page, " "prove that you are not accessing the nginx listening port. Good luck." msgstr "" -"
Luna是单独部署的一个程序,你需要部署luna,coco,配置nginx做url分发,
如果你看到了这个页面,证明你访问的不是nginx监听的端口,祝你好运" +"
Luna是单独部署的一个程序,你需要部署luna,koko,
如果你看到了" +"这个页面,证明你访问的不是nginx监听的端口,祝你好运
" #: ops/api/celery.py:54 msgid "Waiting task start" diff --git a/apps/ops/inventory.py b/apps/ops/inventory.py index 694957b14..ffd7e8619 100644 --- a/apps/ops/inventory.py +++ b/apps/ops/inventory.py @@ -15,7 +15,7 @@ logger = get_logger(__file__) class JMSBaseInventory(BaseInventory): - windows_ssh_default_ssh = settings.WINDOWS_SSH_DEFAULT_SHELL + windows_ssh_default_shell = settings.WINDOWS_SSH_DEFAULT_SHELL def convert_to_ansible(self, asset, run_as_admin=False): info = { @@ -35,7 +35,7 @@ class JMSBaseInventory(BaseInventory): if asset.is_windows(): info["vars"].update({ "ansible_connection": "ssh", - "ansible_shell_type": self.windows_ssh_default_ssh, + "ansible_shell_type": self.windows_ssh_default_shell, }) for label in asset.labels.all(): info["vars"].update({ diff --git a/apps/terminal/views/terminal.py b/apps/terminal/views/terminal.py index 6396094ab..56e3a4dc9 100644 --- a/apps/terminal/views/terminal.py +++ b/apps/terminal/views/terminal.py @@ -135,4 +135,4 @@ class WebTerminalView(View): class WebSFTPView(View): def get(self, request, *args, **kwargs): - return redirect('/coco/elfinder/sftp/?' + request.GET.urlencode()) + return redirect('/koko/elfinder/sftp/?' + request.GET.urlencode()) diff --git a/jms b/jms index 805faac50..d67c2fa35 100755 --- a/jms +++ b/jms @@ -205,6 +205,10 @@ def parse_service(s): ] if s == 'all': return all_services + elif s == "web": + return ['gunicorn', 'flower'] + elif s == "task": + return ["celery_ansible", "celery_default", "beat"] elif s == 'gunicorn': return ['gunicorn', 'flower'] elif s == "celery": @@ -474,7 +478,7 @@ if __name__ == '__main__': ) parser.add_argument( "service", type=str, default="all", nargs="?", - choices=("all", "gunicorn", "celery", "beat", "celery,beat", "flower"), + choices=("all", "web", "task", "gunicorn", "celery", "beat", "celery,beat", "flower"), help="The service to start", ) parser.add_argument('-d', '--daemon', nargs="?", const=1)