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
e817715d
Commit
e817715d
authored
Dec 15, 2015
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix asset update bug
parent
9c0825ce
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
10 deletions
+23
-10
views.py
jasset/views.py
+1
-1
jumpserver.conf
jumpserver.conf
+8
-8
urls.py
jumpserver/urls.py
+1
-0
views.py
jumpserver/views.py
+13
-1
install.html
templates/install.html
+0
-0
test.html
templates/test.html
+0
-0
No files found.
jasset/views.py
View file @
e817715d
...
...
@@ -451,7 +451,7 @@ def asset_update(request):
return
HttpResponseRedirect
(
reverse
(
'asset_detail'
)
+
'?id=
%
s'
%
asset_id
)
else
:
asset_ansible_update
([
asset
],
name
)
return
HttpResponseRedirect
(
reverse
(
'asset_detail'
)
+
'
/
?id=
%
s'
%
asset_id
)
return
HttpResponseRedirect
(
reverse
(
'asset_detail'
)
+
'?id=
%
s'
%
asset_id
)
@require_role
(
'admin'
)
...
...
jumpserver.conf
View file @
e817715d
#coding: utf8
[
base
]
url
=
http
://
yourIP
key
=
16
位字母数字
log
=
debug
|
warning
url
=
http
://
j
key
=
88
aaaf7ffe3c6c04
log
=
debug
[
db
]
host
=
127
.
0
.
0
.
1
...
...
@@ -13,12 +13,12 @@ password = mysql234
database
=
jumpserver
[
websocket
]
web_socket_host
=
yourIP
|
yourDomainName
:
3000
web_socket_host
=
j
:
3000
[
mail
]
mail_enable
=
1
email_host
=
yourSMTPHost
email_port
=
yourSMTPHost
|
25
email_host_user
=
yourEmail
email_host_password
=
yourEmailPassword
email_host
=
smtp
.
exmail
.
qq
.
com
email_port
=
25
email_host_user
=
noreply
@
jumpserver
.
org
email_host_password
=
jumpserver1234
email_use_tls
=
True
jumpserver/urls.py
View file @
e817715d
...
...
@@ -14,6 +14,7 @@ urlpatterns = patterns('jumpserver.views',
url
(
r'^setting'
,
'setting'
,
name
=
'setting'
),
url
(
r'^terminal/$'
,
'web_terminal'
,
name
=
'terminal'
),
url
(
r'^install/$'
,
'install'
,
name
=
'install'
),
url
(
r'^install/test/(\w+)/$'
,
'install_test'
,
name
=
'install_test'
),
url
(
r'^juser/'
,
include
(
'juser.urls'
)),
url
(
r'^jasset/'
,
include
(
'jasset.urls'
)),
url
(
r'^jlog/'
,
include
(
'jlog.urls'
)),
...
...
jumpserver/views.py
View file @
e817715d
...
...
@@ -357,4 +357,16 @@ def web_terminal(request):
def
install
(
request
):
return
render_to_response
(
'test.html'
,
locals
())
return
render_to_response
(
'install.html'
,
locals
())
def
install_test
(
request
,
offset
):
if
offset
==
'db'
:
db_host
=
request
.
GET
.
get
(
'db_host'
)
db_port
=
request
.
GET
.
get
(
'db_port'
)
db_user
=
request
.
GET
.
get
(
'db_user'
)
db_pass
=
request
.
GET
.
get
(
'db_pass'
)
db
=
request
.
GET
.
get
(
'db'
)
templates/install.html
View file @
e817715d
This diff is collapsed.
Click to expand it.
templates/test.html
deleted
100644 → 0
View file @
9c0825ce
This diff is collapsed.
Click to expand it.
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