Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
93895b6b
Commit
93895b6b
authored
Mar 14, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改一些文案说明和翻译
parent
3822d518
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
12 deletions
+11
-12
asset.py
apps/assets/forms/asset.py
+4
-6
admin_user_list.html
apps/assets/templates/assets/admin_user_list.html
+2
-1
system_user_list.html
apps/assets/templates/assets/system_user_list.html
+4
-2
django.mo
apps/i18n/zh/LC_MESSAGES/django.mo
+0
-0
django.po
apps/i18n/zh/LC_MESSAGES/django.po
+0
-0
task_list.html
apps/ops/templates/ops/task_list.html
+1
-3
No files found.
apps/assets/forms/asset.py
View file @
93895b6b
...
...
@@ -35,9 +35,8 @@ class AssetCreateForm(forms.ModelForm):
'ip'
:
'* required'
,
'port'
:
'* required'
,
'admin_user'
:
_
(
'Admin user is a privilege user exist on this asset,'
'Example: root or other NOPASSWD sudo privilege user'
'If asset not support ansible, set any one'
'root or other NOPASSWD sudo privilege user existed in asset,'
'If asset is windows or other set any one, more see admin user left menu'
),
'platform'
:
_
(
"* required Must set exact system platform, Windows, Linux ..."
)
}
...
...
@@ -68,9 +67,8 @@ class AssetUpdateForm(forms.ModelForm):
'port'
:
'* required'
,
'cluster'
:
'* required'
,
'admin_user'
:
_
(
'Admin user is a privilege user exist on this asset,'
'Example: root or other NOPASSWD sudo privilege user'
'If asset not support ansible, set any one'
'root or other NOPASSWD sudo privilege user existed in asset,'
'If asset is windows or other set any one, more see admin user left menu'
),
'platform'
:
_
(
"* required Must set exact system platform, Windows, Linux ..."
)
}
...
...
apps/assets/templates/assets/admin_user_list.html
View file @
93895b6b
...
...
@@ -5,7 +5,8 @@
{% block help_message %}
<div
class=
"alert alert-info help-message"
>
管理用户是 服务器上已存在的特权用户,Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。
管理用户是服务器的root,或拥有 NOPASSWD: ALL sudo权限的用户,Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。
Windows或其它硬件可以随意设置一个
</div>
{% endblock %}
...
...
apps/assets/templates/assets/system_user_list.html
View file @
93895b6b
...
...
@@ -3,8 +3,10 @@
{% block help_message %}
<div
class=
"alert alert-info help-message"
>
系统用户是 用户登录资产(服务器)时使用的用户,如 web, sa, dba等具有特殊功能的用户。系统用户创建时,如果选择了自动推送
Jumpserver会使用ansible自动推送系统用户到资产中,如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。
系统用户是 Jumpserver跳转登录资产时使用的用户,可以理解为登录资产用户,如 web, sa, dba(`ssh web@some-host`), 而不是使用某个用户的用户名跳转登录服务器(`ssh xiaoming@some-host`);
简单来说是 用户使用自己的用户名登录Jumpserver, Jumpserver使用系统用户登录资产。
系统用户创建时,如果选择了自动推送 Jumpserver会使用ansible自动推送系统用户到资产中,如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。
目前还不支持Windows的自动推送
</div>
{% endblock %}
...
...
apps/i18n/zh/LC_MESSAGES/django.mo
View file @
93895b6b
No preview for this file type
apps/i18n/zh/LC_MESSAGES/django.po
View file @
93895b6b
This diff is collapsed.
Click to expand it.
apps/ops/templates/ops/task_list.html
View file @
93895b6b
...
...
@@ -112,9 +112,7 @@ $(document).ready(function() {
alert
(
data
)
};
var
success
=
function
()
{
setTimeout
(
function
()
{
console
.
log
(
"ok"
)
},
1000
);
alert
(
"任务开始执行,重定向到任务详情页面,多刷新几次查看结果"
)
window
.
location
=
"{% url 'ops:task-detail' pk=DEFAULT_PK %}"
.
replace
(
'{{ DEFAULT_PK }}'
,
uid
);
};
APIUpdateAttr
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment