Commit Graph

1648 Commits (eb4ec47f7a49f5db397973ad1dee3d026cae5f6c)

Author SHA1 Message Date
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
ibuler ff5b339ce8 Update asset_cu_list.html 2016-01-09 21:51:07 +08:00
ibuler 70c86d2a44 修改windows下 web terminal窗口高度 2016-01-09 21:50:22 +08:00
ibuler 0924484bc4 Update install.py 2016-01-09 21:42:44 +08:00
Honghui Ding dd36857cf8 Get SSH client IP address 2016-01-09 07:37:28 +00:00
ibuler 2f54c369f7 Update README.md 2016-01-08 17:16:06 +08:00
ibuler 9e5402e2c3 Merge branch 'master' of github.com:ibuler/jumpserver 2016-01-08 11:49:33 +08:00
ibuler 097d77755a Merge branch 'dev' 2016-01-08 11:48:57 +08:00
wangyong 4fbeb5c172 fix cpu bug 2016-01-07 19:19:05 +08:00
ibuler 23b04fbbd7 Merge pull request #36 from chnliyong/master
Ubuntu的passwd命令不支持--stdin选项,使用chpasswd替代,在CentOS上已经验证有效
2016-01-07 19:06:12 +08:00
Tad Wang d9455e3f9b fix wss issue when using https #37 2016-01-07 15:59:57 +08:00
yumaojun beeb2442ad 回收sudo用户, 添加sudo别名添加规则检查 2016-01-07 15:21:39 +08:00
yumaojun f6a228008b 回收sudo用户, 添加sudo别名添加规则检查 2016-01-07 15:15:44 +08:00
LI Yong 73522dc4c1 Ubuntu's passwd command doesn't support --stdin option, use chpasswd which is also available in CentOS 2016-01-07 14:09:11 +08:00
ibuler d9b4f5504c Merge branch 'dev' 2016-01-05 19:29:56 +08:00