version 2.0.0 beta

.gitignore

@@ -1,3 +1,43 @@
+*.py[cod]
 .idea
-*.pyc
-*.log
+test.py
+
+# C extensions
+*.so
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+__pycache__
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+node_modules
+logs
+keys
+jumpserver.conf
+nohup.out

README.md

@@ -1,39 +1,2 @@
-Jumpserver是什么？
------------------
-Jumpserver是用Python+Django写的一个开源的跳板机(堡垒机)项目，来集中管理服务器的账号、密码和权限。
-
-1.1版本更新
------------------
-更新Log见笔者blog<br>
-http://laoguang.blog.51cto.com/6013350/1576502
-
-部署文档
------------------
-部署文档见笔者blog<br>
-http://laoguang.blog.51cto.com/6013350/1576729
-
-功能截图
------------------
-1. 安装<br>
- ![install](https://github.com/ibuler/static/blob/master/jumpserver1.1/1.%20install.png)
-2. 登陆<br>
- ![login](https://github.com/ibuler/static/blob/master/jumpserver1.1/2.login.png)
-3. 添加组<br>
-![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/3.addgroup.png)
-4. 添加用户<br>![adduser](https://github.com/ibuler/static/blob/master/jumpserver1.1/5.adduser.png)
-5. 添加主机<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/9.addhost.png)
-6. 添加权限<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/11.addperm.png)
-7. 查看权限<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/13.showperm.png)
-8. 下载私钥<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/16.downkey.png)
-9. 登陆shell<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/17.loginshell.png)
-10. 显示有权限的主机<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/18.p.png)
-11. 批量执行命令<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/19.e.png)
-12. 登陆有权限的主机<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/20.%20loginserver.png)
-13. 查看sudo<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/22.showsudo.png)
-14. 修改sudo<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/25.addsudohost.png)
-15. 查看实时监控<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/29.monitor1ok.png)
-16. 结束会话<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/28.%20killsession.png)
-17. 查看统计日志<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/30.viewlog2.png)
-18. 修改密码<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/34.modpass.png)
-19. 下载文件<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/32.downfile.png)
-20. 上传文件<br>![addgroup](https://github.com/ibuler/static/blob/master/jumpserver1.1/30.upfile.png)
+# jumpserver
+#