pull/2/head
guanghongwei 2014-11-12 17:56:56 +08:00
parent fa2358d22b
commit 7e6a4621c5
2 changed files with 4 additions and 2 deletions

View File

@ -15,4 +15,5 @@ key = 88aaaf7ffe3c6c04
ldap_host = ldap://127.0.0.1:389
ldap_base_dn = dc=yolu,dc=com
admin_cn = cn=admin,dc=yolu,dc=com
admin_pass = VNLqNCjpNBIetEoCA2h3
admin_pass = VNLqNCjpNBIetEoCA2h3
web_socket_host = 172.10.10.9

View File

@ -35,6 +35,7 @@ ldap_base_dn = cf.get('jumpserver', 'ldap_base_dn')
admin_cn = cf.get('jumpserver', 'admin_cn')
admin_pass = cf.get('jumpserver', 'admin_pass')
log_dir = os.path.join(CONF_DIR, 'logs')
web_socket_host = cf.get('jumpserver', 'web_socket_host')
def keygen(num):
@ -1100,7 +1101,7 @@ def logView(request):
logs = paginator.page(paginator.num_pages)
return render_to_response('logView.html',
{'logs': logs},
{'logs': logs, 'web_socket_host': web_socket_host},
context_instance=RequestContext(request))