github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,608 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

1608 Commits (edad26e05b0a5f12a45c935a1f610bb7992d8902)

Author SHA1 Message Date
liuzheng712 94a4d68be2 fix(webterminal.js): send bug 2016-03-04 20:12:09 +08:00
liuzheng712 b879e724e2 fix(webterminal.js): forget rowHeight and colWidth 2016-03-04 20:09:05 +08:00
liuzheng712 234f79857c fix(webterminal): change it to HTML5 websocket 2016-03-04 20:07:05 +08:00
liuzheng712 f73d34b9cc fix(monitor): change monitor url 2016-03-04 19:48:52 +08:00
liuzheng712 936faad1b9 fix(base.jinja2): change script with term.js 2016-03-04 19:35:53 +08:00
ibuler 649783d2c3 Merge pull request #114 from jumpserver/bug_fix_guang 
change(with pre fix) 修改安装和jumpserver.conf
 2016-03-03 18:18:36 +08:00
ibuler c0bacb7c7c change(with pre fix) 修改安装和jumpserver.conf 
上次修改已可以自动获取 ws地址，去掉无用设置和配置文件指定
去掉install.py中的设置
 2016-03-03 18:16:11 +08:00
ibuler 6436fab837 Merge pull request #113 from jumpserver/bug_fix_guang 
fix(ws protocal): 修复所有ws自动获取
 2016-03-03 18:09:26 +08:00
ibuler e38620a2a2 Merge pull request #111 from jumpserver/install_bug_fix 
修复一些install.py 中的小问题
 2016-03-03 18:08:04 +08:00
ibuler 702b1bd3b7 fix(ws protocal): 修复所有ws自动获取 
自动获取websocket无需再手动指定
 2016-03-03 18:05:10 +08:00
ibuler c2c833f279 Merge pull request #112 from jumpserver/issue_110_bugfix 
修复webterminal vim后命令double
 2016-03-03 17:21:42 +08:00
liuzheng712 a816a7b149 fix(webterminal): bug fix test 2016-03-03 17:03:47 +08:00
liuzheng712 32519f8eae fix: 2016-03-03 16:50:49 +08:00
liuzheng712 dbb4904513 fix(webterminal): test 2016-03-03 16:41:41 +08:00
liuzheng712 0e7a8c1a62 fix(webterminal): test 2016-03-03 16:39:14 +08:00
yumaojun 68582ca466 fix (install.py): 　修复lockfile 创建失败问题 2016-03-03 16:37:12 +08:00
liuzheng712 b1f0297e82 fix(web terminal): test 2016-03-03 16:35:48 +08:00
liuzheng712 eeff2ab215 fix(webterminal): test 2016-03-03 16:34:22 +08:00
yumaojun 62fb6429f9 fix (install.py): 　更新install.py 和 service.sh 
1. 添加软件安装失败后的用户提醒
2. service.sh脚本添加对lockfile 目录缺失的处理。
 2016-03-03 15:53:46 +08:00
ibuler 90c3ed96e3 Merge pull request #109 from jumpserver/bug_fix_guang 
fix(web teminal): 修改动态改变窗口大小bug
 2016-03-02 11:40:28 +08:00
ibuler c79e625000 fix(web teminal): 修改动态改变窗口大小bug 
变量名写错引起的不明显bug
 2016-03-02 11:38:38 +08:00
Huang Chengwei bce3def4c6 Update run_server.py 
fix signal call in auth
 2016-03-01 17:09:27 +08:00
ibuler 1437140f87 Merge pull request #108 from jumpserver/bug_fix_guang 
fix(run_server.py) 修改一个常规错误，函数参数个数
 2016-03-01 17:03:33 +08:00
ibuler fd19bb6299 fix(run_server.py) 修改一个常规错误，函数参数个数 
已fix
 2016-03-01 17:01:11 +08:00
ibuler a401440004 Merge pull request #105 from jumpserver/hot_fix_log 
hot_fix(kill invalid connection) 紧急修复超时异常连接

修改日志参数
修改处理间隔，每10分钟处理一次
修改处理策略 ssh: 1小时不操作，就kill掉 web: 超过1天，就设置完成
 2016-02-29 18:18:57 +08:00
ibuler 06aef8fb1a Merge pull request #106 from jumpserver/issue_57_bug_fix 
1. 修复tonrado数据库连接bug
2. 修改定期处理长时间连接
3. 添加nginx文档

ref #57
 2016-02-29 18:18:10 +08:00
ibuler c418f142ba Merge remote-tracking branch 'origin/issue_57_bug_fix' into dev 2016-02-29 18:15:31 +08:00
ibuler 88d21caa19 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-02-29 18:14:50 +08:00
ibuler f6c58054a6 Merge branch 'hot_fix_log' into dev 2016-02-29 17:59:25 +08:00
ibuler b4d74bc589 hot_fix(kill invalid connection) 紧急修复超时异常连接 
1. 修改日志参数
2. 修改处理间隔，每10分钟处理一次
3. 修改处理策略
   ssh: 1小时不操作，就kill掉
   web: 超过1天，就设置完成
 2016-02-29 17:53:15 +08:00
ibuler d7bb4c1005 fix(kill invalid connection) 紧急处理超时连接 
1. 紧急修复异常bug
2. 修改处理策略
3. 每10分钟处理一次
   ssh连接：超过1小时没有操作就干掉
   web：超过1天的就设置完成
 2016-02-29 17:48:14 +08:00
ibuler 3c610668b5 fix(invalid connection again) 定期处理长时间连接 
1. 减少了处理时间间隔
2. 处理策略更改为 超过 1小时没有动的连接就干掉
 2016-02-29 17:07:53 +08:00
ibuler 5d28a6e402 fix(invalid connection) 定期处理长时间连接 
1. 减少了处理时间间隔
2. 处理策略更改为 超过 1小时没有动的连接就干掉
 2016-02-29 16:35:09 +08:00
黄成维 e886b55727 fix signal send 2016-02-29 16:09:01 +08:00
黄成维 8c552ccc45 fix signal send 2016-02-29 16:06:20 +08:00
黄成维 054edeefb6 try fix tornado connection timeout 2016-02-29 15:03:48 +08:00
ibuler 6c599e0127 Merge pull request #101 from jumpserver/bug_fix_yu 
install.py安装兼容多个平台
 2016-02-29 12:21:41 +08:00
ibuler 4f97987061 Merge pull request #97 from jumpserver/bug_fix_guang 
fix 启动脚本，配置文件，批量命令异常等
 2016-02-29 12:17:31 +08:00
yumaojun 50e82c5b99 fix (install.py): 　更新wiki地址 2016-02-29 11:08:48 +08:00
yumaojun 1f9337feca fix (install.py): 　compatible fedora 
1. mysql-python编译不过, 添加rpm-build 依赖
 2016-02-29 10:58:31 +08:00
ibuler cba53bba55 modify(jumpserver.conf) 修改jumpserver.conf默认配置 
django和tornado统一入口后，配置默认启动端口80
websocket和web都使用该端口
 2016-02-29 10:25:59 +08:00
yumaojun 427fda1015 fix (install.py): 　compatible fedora 
1. compatible fedora (test fedora22)
 2016-02-29 10:09:05 +08:00
yumaojun a95e1bb835 fix (install.py): 　compatible fedora 
1. compatible fedora (test fedora22)
 2016-02-29 09:52:10 +08:00
Tad Wang 5ab882ae66 update configuration doc 
typo of KEYWORD of SSL configuration
 2016-02-29 01:37:20 +08:00
Tad Wang e5ce5766be add document for nginx ssl setting #88 
add document for nginx ssl configuration. #88
 2016-02-29 01:27:51 +08:00
ibuler 725405e4fd change(install) 修改提示，更改变化的文件名 run_server.py 
websocket -> websocket_url
 2016-02-28 16:41:44 +08:00
ibuler cad7a193b3 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-02-28 16:32:33 +08:00
ibuler 69ac8ae147 Merge pull request #99 from jumpserver/misunderstand_4_default_DB_user 
安装脚本默认数据库用户名
 2016-02-28 16:09:31 +08:00
yumaojun 247e5e7f24 fix (install.py): 　little update to contain liuzheng pr. 
1. 请输入数据库服务器用户 [root] , 修改成　[jumpserver]
 2016-02-28 15:55:21 +08:00
yumaojun 04821a00f8 fix (install.py): 　compatable centos7 
1. use systemctl  stop firewalld
2. add  dependence:  readline-devel and lrzsz
3. use mariadb as mysql server
 2016-02-28 15:47:39 +08:00