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

[Update] 修改启动的参数，修改inventory参数名称 (#3276)

pull/3278/head
老广 2019-09-25 14:40:19 +08:00 committed by GitHub
parent 40ce9256fc
commit d3d72f85fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jumpserver/views.py
View File

@ -190,7 +190,7 @@ class IndexView(PermissionsMixin, TemplateView):
class LunaView(View): class LunaView(View):
def get(self, request): def get(self, request):
msg = _("<div>Luna is a separately deployed program, you need to deploy Luna, coco, configure nginx for url distribution,</div> " msg = _("<div>Luna is a separately deployed program, you need to deploy Luna, koko, configure nginx for url distribution,</div> "
"</div>If you see this page, prove that you are not accessing the nginx listening port. Good luck.</div>") "</div>If you see this page, prove that you are not accessing the nginx listening port. Good luck.</div>")
return HttpResponse(msg) return HttpResponse(msg)

BIN
apps/locale/zh/LC_MESSAGES/django.mo
View File

Binary file not shown.

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

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n" "Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: Jumpserver team<ibuler@qq.com>\n" "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@ -620,7 +620,7 @@ msgid "Domain"
msgstr "网域" msgstr "网域"
#: assets/forms/asset.py:68 assets/forms/asset.py:103 assets/forms/asset.py:116 #: 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 #: assets/templates/assets/asset_create.html:42
#: perms/forms/asset_permission.py:82 perms/forms/asset_permission.py:89 #: perms/forms/asset_permission.py:82 perms/forms/asset_permission.py:89
#: perms/templates/perms/asset_permission_list.html:53 #: perms/templates/perms/asset_permission_list.html:53
@ -1107,7 +1107,7 @@ msgstr "默认资产组"
msgid "User" msgid "User"
msgstr "用户" 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 #: assets/templates/assets/label_list.html:15 settings/models.py:30
msgid "Value" msgid "Value"
msgstr "值" msgstr "值"
@ -1116,19 +1116,19 @@ msgstr "值"
msgid "Category" msgid "Category"
msgstr "分类" msgstr "分类"
#: assets/models/node.py:230 #: assets/models/node.py:163
msgid "New node" msgid "New node"
msgstr "新节点" msgstr "新节点"
#: assets/models/node.py:318 #: assets/models/node.py:328
msgid "ungrouped" msgid "ungrouped"
msgstr "未分组" msgstr "未分组"
#: assets/models/node.py:320 #: assets/models/node.py:330
msgid "empty" msgid "empty"
msgstr "空" msgstr "空"
#: assets/models/node.py:393 #: assets/models/node.py:403
msgid "Key" msgid "Key"
msgstr "键" msgstr "键"
@ -1182,7 +1182,7 @@ msgstr "Shell"
msgid "Login mode" msgid "Login mode"
msgstr "登录模式" 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/models.py:20 audits/templates/audits/ftp_log_list.html:52
#: audits/templates/audits/ftp_log_list.html:75 #: audits/templates/audits/ftp_log_list.html:75
#: perms/forms/asset_permission.py:85 perms/forms/remote_app_permission.py:40 #: perms/forms/asset_permission.py:85 perms/forms/remote_app_permission.py:40
@ -2733,13 +2733,12 @@ msgstr "仪表盘"
#: jumpserver/views.py:193 #: jumpserver/views.py:193
msgid "" msgid ""
"<div>Luna is a separately deployed program, you need to deploy Luna, coco, " "<div>Luna is a separately deployed program, you need to deploy Luna, koko, "
"configure nginx for url distribution,</div> </div>If you see this page, " "configure nginx for url distribution,</div> </div>If you see this page, "
"prove that you are not accessing the nginx listening port. Good luck.</div>" "prove that you are not accessing the nginx listening port. Good luck.</div>"
msgstr "" msgstr ""
"<div>Luna是单独部署的一个程序，你需要部署luna，coco，配置nginx做url分发, </" "<div>Luna是单独部署的一个程序，你需要部署luna，koko, </div><div>如果你看到了"
"div><div>如果你看到了这个页面，证明你访问的不是nginx监听的端口，祝你好运</" "这个页面，证明你访问的不是nginx监听的端口，祝你好运</div>"
"div>"
#: ops/api/celery.py:54 #: ops/api/celery.py:54
msgid "Waiting task start" msgid "Waiting task start"

4
apps/ops/inventory.py
View File

@ -15,7 +15,7 @@ logger = get_logger(__file__)
class JMSBaseInventory(BaseInventory): 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): def convert_to_ansible(self, asset, run_as_admin=False):
info = { info = {
@ -35,7 +35,7 @@ class JMSBaseInventory(BaseInventory):
if asset.is_windows(): if asset.is_windows():
info["vars"].update({ info["vars"].update({
"ansible_connection": "ssh", "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(): for label in asset.labels.all():
info["vars"].update({ info["vars"].update({

2
apps/terminal/views/terminal.py
View File

@ -135,4 +135,4 @@ class WebTerminalView(View):
class WebSFTPView(View): class WebSFTPView(View):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
return redirect('/coco/elfinder/sftp/?' + request.GET.urlencode()) return redirect('/koko/elfinder/sftp/?' + request.GET.urlencode())

6
jms
View File

@ -205,6 +205,10 @@ def parse_service(s):
] ]
if s == 'all': if s == 'all':
return all_services return all_services
elif s == "web":
return ['gunicorn', 'flower']
elif s == "task":
return ["celery_ansible", "celery_default", "beat"]
elif s == 'gunicorn': elif s == 'gunicorn':
return ['gunicorn', 'flower'] return ['gunicorn', 'flower']
elif s == "celery": elif s == "celery":
@ -474,7 +478,7 @@ if __name__ == '__main__':
) )
parser.add_argument( parser.add_argument(
"service", type=str, default="all", nargs="?", "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", help="The service to start",
) )
parser.add_argument('-d', '--daemon', nargs="?", const=1) parser.add_argument('-d', '--daemon', nargs="?", const=1)