Commit Graph

67 Commits

Author SHA1 Message Date
ibuler
c0bacb7c7c change(with pre fix) 修改安装和jumpserver.conf
上次修改已可以自动获取 ws地址,去掉无用设置和配置文件指定
去掉install.py中的设置
2016-03-03 18:16:11 +08:00
yumaojun
62fb6429f9 fix (install.py):  更新install.py 和 service.sh
1. 添加软件安装失败后的用户提醒
2. service.sh脚本添加对lockfile 目录缺失的处理。
2016-03-03 15:53:46 +08:00
ibuler
6c599e0127 Merge pull request #101 from jumpserver/bug_fix_yu
install.py安装兼容多个平台
2016-02-29 12:21:41 +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
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
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
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
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
ibuler
dee1d31fc0 change(with 6be7003) 联动改变安装脚本
1. 为init.sh添加执行权限
2. 统一函数功能  修改其他需要改变权限的脚本或目录
2016-02-23 18:29:23 +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
2e5c01a4da Merge pull request #47 from iambocai/master
当用户未被授予任何角色/主机权限时,提示用户
根据用户实际安装路径,替换启动脚本中connect.py的路径
修正几处拼写错误
2016-02-20 22:53:27 +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
iambocai bob.chen.cs@gmail.com
0b79f754f9 1. 当用户未被授予任何角色/主机权限时,提示用户
2. 根据用户实际安装路径,替换启动脚本中connect.py的路径
3. 修正几处拼写错误
2016-01-25 18:21:07 +08:00
ibuler
6ba9191b30 update LANG setting 2016-01-14 11:58:53 +08:00
ibuler
66e53c2701 Update zzjumpserver.sh 2016-01-13 14:06:36 +08:00
ibuler
9d7c30336e 修复中文字符报错 2016-01-11 18:12:30 +08:00
ibuler
0924484bc4 Update install.py 2016-01-09 21:42:44 +08:00
ParInshOvGotQuep
79300b752b 修复找回密码及静态key问题 2016-01-04 13:56:47 +08:00
ibuler
b1a36bbb11 fix 2015-12-31 16:35:17 +08:00
ibuler
6ff030847e Merge branch 'sh1' into sh 2015-12-31 16:18:50 +08:00
ibuler
49f2f92a9c fix输入换行 2015-12-31 11:20:41 +08:00
ParInshOvGotQuep
90b875adae 修改普通用户默认shell为connect.py,修复jailbreak 2015-12-30 19:15:33 +08:00
ibuler
09416286bf fix install port bug 2015-12-29 13:09:05 +08:00
ibuler
c5f9db450d 添加查看quickstart提示 2015-12-29 11:37:52 +08:00
ibuler
48cf64cd3a port int 2015-12-29 11:12:41 +08:00
ibuler
13d325e259 捕捉smtp异常 2015-12-22 17:18:53 +08:00
ibuler
7adcb11f1d comment newline 2015-12-21 16:58:30 +08:00
ibuler
42f6392cc4 fix install script bug 2015-12-21 16:10:07 +08:00
ibuler
a7e2592fa8 fix install bug 2015-12-21 12:18:36 +08:00
ibuler
48af55adab 添加readline 2015-12-20 19:30:42 +08:00
ibuler
c36267dc17 rebase version 2015-12-20 19:09:18 +08:00
ibuler
b7eb95f85f 修复安装bug 2015-12-20 17:45:57 +08:00
ibuler
8494989715 修改install 2015-12-19 21:56:42 +08:00
ibuler
c8c0366b39 Merge with dev 2015-12-19 21:14:16 +08:00