github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,362 Commits
68 Branches
249 Tags
110 MiB
Commit Graph

1362 Commits (267c1cd69624b7340a67092844ced6fa4ddbe31f)

Author SHA1 Message Date
ibuler 267c1cd696 Merge pull request #142 from jumpserver/bug_asset_upload 
fix asset upload bug
 2016-03-22 18:03:00 +08:00
wangyong a1e947ae1e fix asset upload bug 2016-03-22 17:32:43 +08:00
ibuler 4dbc6803fb Update README.md 2016-03-21 11:00:31 +08:00
jiaxiangkong b02a45ee6c Update README.md 2016-03-10 17:43:37 +08:00
jiaxiangkong f796e8f673 Update README.md 2016-03-10 17:42:45 +08:00
jiaxiangkong 930c57398a Update README.md 2016-03-10 17:40:54 +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 b4d74bc589 hot_fix(kill invalid connection) 紧急修复超时异常连接 
1. 修改日志参数
2. 修改处理间隔，每10分钟处理一次
3. 修改处理策略
   ssh: 1小时不操作，就kill掉
   web: 超过1天，就设置完成
 2016-02-29 17:53:15 +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 586e43c8d0 Merge pull request #71 from jumpserver/dev 
fix(bsd推送系统用户bug)
 2016-02-23 15:50:59 +08:00
ibuler 18e66f52dd Merge remote-tracking branch 'origin/dev' into dev 2016-02-23 15:45:32 +08:00
yumaojun 09e86f0a6b Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2016-02-23 15:22:15 +08:00
yumaojun 3b5daf19c3 １. 修复freebsd 推送带sudo规则的用户时 , sudo　路径引发的问题。 2016-02-23 15:21:27 +08:00
ibuler 9fa7f8762e Merge branch 'master' into dev 2016-02-23 13:35:36 +08:00
ibuler 9ec457bf5f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2016-02-23 13:35:28 +08:00
ibuler 2691cc0b6d Merge branch 'master' into dev 2016-02-23 13:33:32 +08:00
yumaojun 4645029a27 1. 配置ansible 使用paramiko进行链接（ssh 有卡死问题, 等待反馈.） 
2. 修复freebsd 推送带sudo规则的用户时 由于 sed  引起的问题。
 2016-02-23 11:48:09 +08:00
ibuler b1768565c1 修复 
1. 推送时 验证改为  /usr/sbin/visudo -c
    2. 添加系统用户的key 认证更改 支持 RSA|DSA
    3. web terminal 行数 -1
 2016-02-22 16:31:33 +08:00
ibuler 7323b72c4b 修复 
1. 推送时 验证改为  /usr/sbin/visudo -c
2. 添加系统用户的key 认证更改 支持 RSA|DSA
3. web terminal 行数 -1
 2016-02-22 16:29:36 +08:00
ibuler 2e5c01a4da Merge pull request #47 from iambocai/master 
当用户未被授予任何角色/主机权限时，提示用户
根据用户实际安装路径，替换启动脚本中connect.py的路径
修正几处拼写错误
 2016-02-20 22:53:27 +08:00
ibuler 19dd1af4dc Merge pull request #49 from wangjunj/master 
添加本地mysqld自启动服务
 2016-02-20 22:51:15 +08:00
ibuler 0e9a962506 具体体现在 日志监控页，定期回收过期的在线log 
需要运行python manage.py crontab add来添加

运行 python manage.py crontab remove 来去掉

crontab -l
 2016-02-20 16:02:31 +08:00
iambocai bob.chen.cs@gmail.com fa195c3808 update for pull#47 2016-02-17 15:16:36 +08:00
wangjunj cd6cfc6ae9 Update install.py 2016-01-28 23:08:12 +08:00
wangjunj 02e9ba54f9 添加本地mysqld自启动服务 
添加数据库自启动服务。修复服务器重启后./server.sh start 会提示错误——“Starting jumpsever
service:run_websocket.py not running”
 2016-01-28 14:50:57 +08:00
ibuler b79056295b Merge branch 'dev' 2016-01-26 15:37:27 +08:00
ibuler 8653630d83 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2016-01-26 15:37:19 +08:00
ibuler 99f09709ec 修改默认端口获取 2016-01-26 15:37:12 +08:00
wangyong bcb914485d fix asset edit port not save 2016-01-26 15:35:47 +08:00
iambocai bob.chen.cs@gmail.com 0b79f754f9 1. 当用户未被授予任何角色/主机权限时，提示用户 
2. 根据用户实际安装路径，替换启动脚本中connect.py的路径
3. 修正几处拼写错误
 2016-01-25 18:21:07 +08:00
ibuler fe87e32e2b roll back 2016-01-21 19:37:20 +08:00
ibuler 9c9390878e Merge branch 'master' of github.com:ibuler/jumpserver 2016-01-21 18:17:29 +08:00
ibuler 1c2cba64ec 修改推送默认端口bug 2016-01-21 18:17:18 +08:00
ibuler b69853a608 Merge pull request #46 from wptad/master 
监控支持 ssl
 2016-01-21 13:21:59 +08:00
Tad Wang 852de35e3e fix term.js input error problem 
handler is undefined.
 2016-01-21 13:02:23 +08:00
Tad Wang 6fbb387488 fix wss support for web_monitor_uri 
Https support
 2016-01-21 11:53:56 +08:00
ibuler 36bfb50aad 系统用户支持. 2016-01-18 12:01:39 +08:00
ibuler 28e0ea3e81 支持用户名带小数点，上传文件大小最大2G 2016-01-15 15:54:49 +08:00
ibuler 6ba9191b30 update LANG setting 2016-01-14 11:58:53 +08:00
ibuler b6f82ca020 修复vim修改窗口大小中断bug 2016-01-14 11:10:07 +08:00
ibuler 81a6f4841f 修复用户组编辑导致该用户组都丢失问题 2016-01-14 11:01:19 +08:00
ibuler f2487a22cd 修复 su - 无法获取 Env的bug 2016-01-13 17:57:32 +08:00
ibuler 4d0331e105 Update connect.py 2016-01-13 15:51:29 +08:00
ibuler 66e53c2701 Update zzjumpserver.sh 2016-01-13 14:06:36 +08:00
ibuler 2e6f3d3579 Merge pull request #42 from hhding/master 
Get SSH client IP address from environment
 2016-01-13 13:20:28 +08:00
ibuler 80fde52dc5 Merge pull request #38 from wptad/master 
fix wss issue when using https  #37 支持 wss 和 https
 2016-01-13 12:32:16 +08:00
ibuler 82a88e0b0a fix 硬盘超过6块数据库溢出 2016-01-12 22:39:44 +08:00
wangyong d3f9fc7a21 disk length 128 to 1024 2016-01-12 22:17:02 +08:00
ibuler 9d7c30336e 修复中文字符报错 2016-01-11 18:12:30 +08:00