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
yumaojun
ad3178fe94
fix (install.py): compatable centos7
...
1. use systemctl stop firewalld
2. add dependence: readline-devel and lrzsz
2016-02-28 15:23:14 +08:00
yumaojun
ccd1a10892
fix (install.py): compatable centos7
...
1. use systemctl stop firewalld
2. add dependence: readline-devel and lrzsz
2016-02-28 15:01:55 +08:00
yumaojun
b80ad40f54
fix (install.py): compatable centos7
...
1. use systemctl stop firewalld
2. add dependence: readline-devel and lrzsz
2016-02-28 14:40:17 +08:00
liuzheng712
7cf190e3f9
refactor(install/install.py): default database user should be jumpserver
2016-02-27 21:25:09 +08:00
yumaojun
cac94245ea
fix (install.py): ubuntu auto install mysql-server
...
1. set ansible_api connector as paramiko
2. set ubuntu apt-get --force-yes when install packages
2016-02-27 18:35:00 +08:00
yumaojun
a729e54425
fix (install.py): ubuntu auto install mysql-server
...
1. auto install mysql server
2016-02-27 13:24:19 +08:00
yumaojun
d4b57fc1b0
fix (install.py): ubuntu auto install mysql-server
...
1. auto install mysql server
2016-02-27 12:43:59 +08:00
yumaojun
d63b5772e4
fix (install.py): check platform
...
1. check platform , support CentOS, ReaHat, Fedora, Ubuntu, debian
2016-02-27 12:05:34 +08:00
yumaojun
37e0f80fb8
fix (install.py): fix install.py add user failed and service failed
...
1. use shlex.os.system replace subprocess.call
2. next.py use bash service start
2016-02-27 12:01:44 +08:00
ibuler
532fbbd4f1
change(service.sh, run_websocket) 修改启动脚本, rename run_websocket.py
...
1. 修改启动脚本,支持放到 init.d
2. rename run_websocket.py -> run_server.py 交互式启动
2016-02-27 01:26:36 +08:00
ibuler
16f5906979
Merge pull request #96 from jumpserver/ip_port_config
...
jumpserver.conf添加字段,tornado根据需求监听端口
2016-02-27 00:24:15 +08:00
ibuler
bf3fb24c3a
Merge pull request #95 from jumpserver/IP_get_bug
...
修复使用反向代理还不使用反向代理获取 remote_ip异常wen问题
2016-02-27 00:23:00 +08:00
ibuler
a8eb9f3e79
fix(jlog, websocket url) 修复ws使用 ws协议还是wss协议
...
1. 不再需要浏览器判断什么协议,需要在jumpserver.conf注明
ref #63
2016-02-27 00:19:04 +08:00
ibuler
a88d8ca410
fix(upload, download, exec, gn) 修复上传下载文件名,上传目录层次,执行命令回车报错,g+不存在id报错
...
1. 上传下载文件名 改为 时间+随机4位字母数字
2. 命令回车判断,为空返回
3. g+1判断,不过不存在该组,则返回
close #52
close #93
ref https://github.com/jumpserver/jumpserver/issues/53
ref https://github.com/jumpserver/jumpserver/issues/93
2016-02-26 23:51:21 +08:00
liuzheng712
ba8d808cd9
fix(service.sh): annotate django runserver
2016-02-26 23:09:19 +08:00
liuzheng712
d67aab573d
fix: ip and port use jumpserver.conf to configure
2016-02-26 22:59:17 +08:00
liuzheng712
5098b1c696
fix(run_websocket.py): remote IP get bug
...
when use nginx self.request.headers.get(X-Real-IP) will get real remote IP,
self.request.remote_ip will get 127.0.0.1 ; if not it will git null, so need to use
self.request.remote_ip for get the ip
2016-02-26 22:48:07 +08:00
yumaojun
0b9b94bc0b
Merge branch 'bug_fix_yu' into dev
...
# Conflicts:
# service.sh
2016-02-26 15:36:42 +08:00
yumaojun
8aec0c1ac7
fix (install jumpserver): install jumpserver compatible with ubuntu
...
1. install.py add platform judge, fix get_ip_addr function
2. next.py little adjust
3. service.sh little adjust
2016-02-26 14:13:21 +08:00
liuzheng712
77f69fbc5e
fix(service.sh): annotate django runserver
2016-02-26 11:52:53 +08:00
liuzheng712
14a0c1871f
Merge branch 'issue_59_bug_fix' into dev
2016-02-26 10:53:29 +08:00
liuzheng712
49e7796df9
Merge branch 'feat_Only_run_one' into dev
2016-02-26 10:45:40 +08:00
liuzheng712
318a053dbf
real ip
2016-02-26 10:38:04 +08:00
ibuler
29953eb7c7
Merge pull request #87 from liuzheng712/feat_run_one
...
整合Tornado和Django,修复web阻断功能
2016-02-26 10:12:23 +08:00
liuzheng712
1816723f16
fix(run_websocket.py): get real ip from headers
2016-02-25 22:43:52 +08:00
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
ibuler
4dfef99216
Merge pull request #85 from jumpserver/bug_fix_issue_83
...
修复用户禁用后仍可ssh登陆跳板机
2016-02-25 18:42:59 +08:00
ibuler
47ce09393c
fix(connect.py) 用户禁用后仍可ssh登陆jumpserver
...
修改connect.py添加判断
资产禁用还没有考虑,改动太大,留后续版本更改
ref https://github.com/jumpserver/jumpserver/issues/83
2016-02-25 18:34:46 +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