Skip to content

J
jumpserver
Commit 7e6a4621 authored by guanghongwei's avatar guanghongwei
Browse files
Options

bugfix

parent fa2358d2
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
jumpserver.conf
View file @ 7e6a4621
...@@ -15,4 +15,5 @@ key = 88aaaf7ffe3c6c04 ...@@ -15,4 +15,5 @@ key = 88aaaf7ffe3c6c04
ldap_host = ldap://127.0.0.1:389 ldap_host = ldap://127.0.0.1:389
ldap_base_dn = dc=yolu,dc=com ldap_base_dn = dc=yolu,dc=com
admin_cn = cn=admin,dc=yolu,dc=com admin_cn = cn=admin,dc=yolu,dc=com
admin_pass = VNLqNCjpNBIetEoCA2h3 admin_pass = VNLqNCjpNBIetEoCA2h3
\ No newline at end of file web_socket_host = 172.10.10.9
\ No newline at end of file
webroot/AutoSa/AutoSa/views.py
View file @ 7e6a4621
...@@ -35,6 +35,7 @@ ldap_base_dn = cf.get('jumpserver', 'ldap_base_dn') ...@@ -35,6 +35,7 @@ ldap_base_dn = cf.get('jumpserver', 'ldap_base_dn')
admin_cn = cf.get('jumpserver', 'admin_cn') admin_cn = cf.get('jumpserver', 'admin_cn')
admin_pass = cf.get('jumpserver', 'admin_pass') admin_pass = cf.get('jumpserver', 'admin_pass')
log_dir = os.path.join(CONF_DIR, 'logs') log_dir = os.path.join(CONF_DIR, 'logs')
web_socket_host = cf.get('jumpserver', 'web_socket_host')
def keygen(num): def keygen(num):
...@@ -1100,7 +1101,7 @@ def logView(request): ...@@ -1100,7 +1101,7 @@ def logView(request):
logs = paginator.page(paginator.num_pages) logs = paginator.page(paginator.num_pages)
return render_to_response('logView.html', return render_to_response('logView.html',
{'logs': logs}, {'logs': logs, 'web_socket_host': web_socket_host},
context_instance=RequestContext(request)) context_instance=RequestContext(request))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment