liuzheng712
|
5fb5c1bb40
|
merge
|
2016-02-25 21:16:09 +08:00 |
liuzheng712
|
4d5d56fe79
|
fix(jlog/views.py): kill bug, because cross domain
|
2016-02-25 21:07:18 +08:00 |
liuzheng712
|
7213c5c637
|
fix(log_online.html): log kill bug
change $.ajax to $.get
|
2016-02-25 21:04:27 +08:00 |
liuzheng712
|
eb161b978a
|
test kill
|
2016-02-25 21:00:48 +08:00 |
liuzheng712
|
23d4c926b7
|
web log_kill
|
2016-02-25 20:45:48 +08:00 |
liuzheng712
|
c354b64679
|
web log_kill
|
2016-02-25 20:44:13 +08:00 |
liuzheng712
|
9c93d5a8d2
|
add /ws/
|
2016-02-25 20:42:35 +08:00 |
liuzheng712
|
4f75f76db8
|
fix: web socket url update
|
2016-02-25 20:05:20 +08:00 |
liuzheng712
|
92e9f988f3
|
feat(run_websocket.py): add main function, it need only run run_websocket.py
I want to run one program at once, open two terminal is ridiculous
|
2016-02-25 16:51:41 +08:00 |
ibuler
|
d0ba0503e5
|
Merge pull request #81 from jumpserver/v3.0_beta_issue_62
V3.0 beta issue 62 用户下载key后,就删除,为了安全
|
2016-02-25 13:15:13 +08:00 |
liuzheng712
|
27be35ae77
|
fix(user_list.html & juser/views.py): only for user delete sshkey when downloaded, add generate butt
https://github.com/jumpserver/jumpserver/issues/62
|
2016-02-25 13:04:09 +08:00 |
ibuler
|
f79675b265
|
Merge pull request #78 from jumpserver/bug_fix_guang
#78 统一资产添加文案,修改添加用户流程,修复添加系统用户使用key推送,不生成密码
|
2016-02-24 15:06:20 +08:00 |
ibuler
|
0a35f757e9
|
modify(function arg) only for writing style
修改函数使用kwarg
|
2016-02-24 14:46:28 +08:00 |
ibuler
|
f60a896926
|
modify(jasset) 统一管理用户文案
所有用得到管理用户文案的地,都进行了统一
更改了 管理用户使用默认的对齐
去掉了分隔线
|
2016-02-24 12:32:41 +08:00 |
ibuler
|
b6fc8b777f
|
change(juse) 修改用户添加流程
1. 添加新用户,不在为该用户设置密码
2. 强制用户使用key登陆跳板机,为了安全性
3. 更改邮件文案和不发送邮件提示文案
|
2016-02-24 12:29:47 +08:00 |
ibuler
|
caefbdc917
|
fix(juser) 推送系统用户,选择密钥时不为用户生成密码
当推送系统用户时,选择系统用户使用密钥时没有必要为系统用户生成密码,
以免造成安全上的问题,在代码上也属于冗余.
|
2016-02-24 11:34:33 +08:00 |
yumaojun
|
c6823be302
|
修复sudo 命令 小写all 引起的推送失败(map)
|
2016-02-23 23:29:15 +08:00 |
yumaojun
|
7bfb1d19fe
|
修复sudo 命令 小写all 引起的推送失败
|
2016-02-23 23:04:46 +08:00 |
yumaojun
|
f24b34758c
|
修复sudo 命令 小写all 引起的推送失败
|
2016-02-23 21:14:54 +08:00 |
ibuler
|
d4b1bdef8e
|
modify(with 0e9a962506 ) 变更启动脚本
1. 启动时添加 django crontab
2. 关闭时删除 django crontab
|
2016-02-23 18:46:00 +08:00 |
ibuler
|
dee1d31fc0
|
change(with 6be7003 ) 联动改变安装脚本
1. 为init.sh添加执行权限
2. 统一函数功能 修改其他需要改变权限的脚本或目录
|
2016-02-23 18:29:23 +08:00 |
ibuler
|
363bce82d8
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2016-02-23 17:49:59 +08:00 |
ibuler
|
6be7003ac2
|
bugfix(登录初始化) 避免登录时ctrl+c进入系统内部
此bug信息见 #72
1. 修改思路 重命名zzjumpserver.sh,并移动到外层
2. 服务器添加用户时指定shell为 some_dir/jumpserver/init.sh
升级修复方案:
1. 删除/etc/profile.d/zzjumpserver.sh
2. git pull 更新
3. vim编辑 /etc/passwd,把之前建的用户的sh改为 some_dir/jumpserver/init.sh
终
Closes #72
closes #31
|
2016-02-23 17:40:33 +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
|
1. 修复freebsd 推送带sudo规则的用户时 , sudo 路径引发的问题。
|
2016-02-23 15:21:27 +08:00 |
liuzheng712
|
a037108cf3
|
refactor: double meaning
|
2016-02-23 14:23:07 +08:00 |
liuzheng712
|
b8a8c3ebf3
|
feat(juser/views.py;func:down_key): delete the private key when user download it
issue:62
|
2016-02-23 14:15:55 +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 |