From 37e0f80fb8cddd64316d23ec8d986d57820fbfe9 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sat, 27 Feb 2016 12:01:44 +0800 Subject: [PATCH 01/14] 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 --- install/install.py | 12 +++++++++--- install/next.py | 9 +++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/install/install.py b/install/install.py index bb3b2027e..77c85b9d5 100755 --- a/install/install.py +++ b/install/install.py @@ -13,6 +13,7 @@ import string import re import platform +import shlex jms_dir = os.path.dirname(os.path.abspath(os.path.dirname(__file__))) sys.path.append(jms_dir) @@ -23,7 +24,7 @@ def bash(cmd): run a bash shell command 执行bash命令 """ - return subprocess.call(cmd, shell=True) + return shlex.os.system(cmd) def valid_ip(ip): @@ -84,14 +85,18 @@ class PreSetup(object): @property def _is_redhat(self): - if self.dist == "centos" or self.dist == "redhat": + if self.dist == "centos" or self.dist == "redhat" or self.dist == "federa": return True @property def _is_ubuntu(self): - if self.dist == "ubuntu": + if self.dist == "ubuntu" or self.dist == "debain": return True + def check_platform(self): + if self._is_redhat or self._is_ubuntu: + raise ValueError(u"支持的平台: CentOS, RedHat, Fedare, Debain, Ubuntu, 暂不支持其他平台安装.") + def write_conf(self, conf_file=os.path.join(jms_dir, 'jumpserver.conf')): color_print('开始写入配置文件', 'green') conf = ConfigParser.ConfigParser() @@ -128,6 +133,7 @@ class PreSetup(object): bash('echo mysql-server mysql-server/root_password select '' | debconf-set-selections') bash('echo mysql-server mysql-server/root_password_again select '' | debconf-set-selections') bash('apt-get -y install mysql-server') + bash('service mysql start') bash('mysql -e "create database %s default charset=utf8"' % self.db) bash('mysql -e "grant all on %s.* to \'%s\'@\'%s\' identified by \'%s\'"' % (self.db, self.db_user, diff --git a/install/next.py b/install/next.py index 49d62db25..9c3250714 100755 --- a/install/next.py +++ b/install/next.py @@ -5,7 +5,7 @@ import sys import os import django from django.core.management import execute_from_command_line -import shutil +import shlex import urllib import socket import subprocess @@ -77,8 +77,8 @@ class Setup(object): user.delete() db_add_user(username=self.admin_user, password=self.admin_pass, role='SU', name='admin', groups='', admin_groups='', email='admin@jumpserver.org', uuid='MayBeYouAreTheFirstUser', is_active=True) - cmd = 'useradd %s' % self.admin_user - subprocess.call(cmd, shell=True) + cmd = 'id %s 2> /dev/null 1> /dev/null || useradd %s' % (self.admin_user, self.admin_user) + shlex.os.system(cmd) @staticmethod def _chmod_file(): @@ -93,7 +93,8 @@ class Setup(object): @staticmethod def _run_service(): - os.system('sh %s start' % os.path.join(jms_dir, 'service.sh')) + cmd = 'bash %s start' % os.path.join(jms_dir, 'service.sh') + shlex.os.system(cmd) print color_print('安装成功，请访问web, 祝你使用愉快。\n请访问 https://github.com/jumpserver/jumpserver 查看文档', 'green') From d63b5772e436485421e8a09cb5e9eccd545f013f Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sat, 27 Feb 2016 12:05:34 +0800 Subject: [PATCH 02/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80check=20pl?= =?UTF-8?q?atform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. check platform , support CentOS, ReaHat, Fedora, Ubuntu, debian --- install/install.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install/install.py b/install/install.py index 77c85b9d5..5eff2eac2 100755 --- a/install/install.py +++ b/install/install.py @@ -85,17 +85,17 @@ class PreSetup(object): @property def _is_redhat(self): - if self.dist == "centos" or self.dist == "redhat" or self.dist == "federa": + if self.dist == "centos" or self.dist == "redhat" or self.dist == "fedora": return True @property def _is_ubuntu(self): - if self.dist == "ubuntu" or self.dist == "debain": + if self.dist == "ubuntu" or self.dist == "debian": return True def check_platform(self): if self._is_redhat or self._is_ubuntu: - raise ValueError(u"支持的平台: CentOS, RedHat, Fedare, Debain, Ubuntu, 暂不支持其他平台安装.") + raise ValueError(u"支持的平台: CentOS, RedHat, Fedora, Debian, Ubuntu, 暂不支持其他平台安装.") def write_conf(self, conf_file=os.path.join(jms_dir, 'jumpserver.conf')): color_print('开始写入配置文件', 'green') @@ -245,6 +245,7 @@ class PreSetup(object): def start(self): color_print('请务必先查看wiki https://github.com/ibuler/jumpserver/wiki/Quickinstall') time.sleep(3) + self.check_platform() self._rpm_repo() self._depend_rpm() self._require_pip() From d4b57fc1b076ea0373c8215c0da2a244a7caa6a8 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sat, 27 Feb 2016 12:43:59 +0800 Subject: [PATCH 03/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80ubuntu=20?= =?UTF-8?q?=20auto=20install=20mysql-server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. auto install mysql server --- install/install.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/install/install.py b/install/install.py index 5eff2eac2..4f331d44a 100755 --- a/install/install.py +++ b/install/install.py @@ -94,8 +94,9 @@ class PreSetup(object): return True def check_platform(self): - if self._is_redhat or self._is_ubuntu: - raise ValueError(u"支持的平台: CentOS, RedHat, Fedora, Debian, Ubuntu, 暂不支持其他平台安装.") + if not (self._is_redhat or self._is_ubuntu): + print(u"支持的平台: CentOS, RedHat, Fedora, Debian, Ubuntu, 暂不支持其他平台安装.") + exit() def write_conf(self, conf_file=os.path.join(jms_dir, 'jumpserver.conf')): color_print('开始写入配置文件', 'green') @@ -130,9 +131,10 @@ class PreSetup(object): self.db_host, self.db_pass)) if self._is_ubuntu: - bash('echo mysql-server mysql-server/root_password select '' | debconf-set-selections') - bash('echo mysql-server mysql-server/root_password_again select '' | debconf-set-selections') - bash('apt-get -y install mysql-server') + cmd1 = 'echo mysql-server mysql-server/root_password select '' | debconf-set-selections' + cmd2 = 'echo mysql-server mysql-server/root_password_again select '' | debconf-set-selections' + cmd3 = 'apt-get -y install mysql-server' + bash('%s; %s; %s' % (cmd1, cmd2, cmd3)) bash('service mysql start') bash('mysql -e "create database %s default charset=utf8"' % self.db) bash('mysql -e "grant all on %s.* to \'%s\'@\'%s\' identified by \'%s\'"' % (self.db, From a729e54425f56e639ed3fbce979f41c635927320 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sat, 27 Feb 2016 13:24:19 +0800 Subject: [PATCH 04/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80ubuntu=20?= =?UTF-8?q?=20auto=20install=20mysql-server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. auto install mysql server --- install/install.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/install.py b/install/install.py index 4f331d44a..82d7bcc7b 100755 --- a/install/install.py +++ b/install/install.py @@ -131,9 +131,9 @@ class PreSetup(object): self.db_host, self.db_pass)) if self._is_ubuntu: - cmd1 = 'echo mysql-server mysql-server/root_password select '' | debconf-set-selections' - cmd2 = 'echo mysql-server mysql-server/root_password_again select '' | debconf-set-selections' - cmd3 = 'apt-get -y install mysql-server' + cmd1 = "echo mysql-server mysql-server/root_password select '' | debconf-set-selections" + cmd2 = "echo mysql-server mysql-server/root_password_again select '' | debconf-set-selections" + cmd3 = "apt-get -y install mysql-server" bash('%s; %s; %s' % (cmd1, cmd2, cmd3)) bash('service mysql start') bash('mysql -e "create database %s default charset=utf8"' % self.db) From cac94245ea5ba150883001d9bd32d8a011080b84 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sat, 27 Feb 2016 18:35:00 +0800 Subject: [PATCH 05/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80ubuntu=20?= =?UTF-8?q?=20auto=20install=20mysql-server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. set ansible_api connector as paramiko 2. set ubuntu apt-get --force-yes when install packages --- install/install.py | 2 +- jperm/ansible_api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install.py b/install/install.py index 82d7bcc7b..cfc7ac4f5 100755 --- a/install/install.py +++ b/install/install.py @@ -191,7 +191,7 @@ class PreSetup(object): if self._is_redhat: bash('yum -y install git python-pip mysql-devel gcc automake autoconf python-devel vim sshpass') if self._is_ubuntu: - bash("apt-get -y install git python-pip gcc automake autoconf vim sshpass libmysqld-dev python-all-dev") + bash("apt-get -y --force-yes install git python-pip gcc automake autoconf vim sshpass libmysqld-dev python-all-dev") @staticmethod diff --git a/jperm/ansible_api.py b/jperm/ansible_api.py index 0b63b48f8..20725908c 100644 --- a/jperm/ansible_api.py +++ b/jperm/ansible_api.py @@ -125,7 +125,7 @@ class MyRunner(MyInventory): self.results_raw = {} def run(self, module_name='shell', module_args='', timeout=10, forks=10, pattern='*', - become=False, become_method='sudo', become_user='root', become_pass='', transport='smart'): + become=False, become_method='sudo', become_user='root', become_pass='', transport='paramiko'): """ run module from andible ad-hoc. module_name: ansible module_name From b80ad40f54cbc6e7818ea93cb0bc55cff85b9c13 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sun, 28 Feb 2016 14:40:17 +0800 Subject: [PATCH 06/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80compatable?= =?UTF-8?q?=20centos7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. use systemctl stop firewalld 2. add dependence: readline-devel and lrzsz --- install/install.py | 22 ++++++++++++++++++---- install/next.py | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/install/install.py b/install/install.py index cfc7ac4f5..2272a84a5 100755 --- a/install/install.py +++ b/install/install.py @@ -88,6 +88,13 @@ class PreSetup(object): if self.dist == "centos" or self.dist == "redhat" or self.dist == "fedora": return True + @property + def _is_centos7(self): + version = platform.dist()[1] + if self._is_redhat: + if version.startswith("7"): + return True + @property def _is_ubuntu(self): if self.dist == "ubuntu" or self.dist == "debian": @@ -146,10 +153,17 @@ class PreSetup(object): color_print('开始关闭防火墙和selinux', 'green') if self._is_redhat: os.system("export LANG='en_US.UTF-8' && sed -i 's/LANG=.*/LANG=en_US.UTF-8/g' /etc/sysconfig/i18n") - bash('service iptables stop && chkconfig iptables off && setenforce 0') + if self._is_centos7: + cmd1 = "systemctl status firewalld 2> /dev/null 1> /dev/null" + cmd2 = "systemctl stop firewalld" + cmd3 = "systemctl disable firewalld" + bash('%s && %s && %s' % (cmd1, cmd2, cmd3)) + bash('setenforce 0') + else: + bash('service iptables stop && chkconfig iptables off && setenforce 0') if self._is_ubuntu: os.system("export LANG='en_US.UTF-8'") - bash("iptables -F") + bash("which iptables && iptables -F") bash('which selinux && setenforce 0') def _test_db_conn(self): @@ -189,9 +203,9 @@ class PreSetup(object): def _depend_rpm(self): color_print('开始安装依赖包', 'green') if self._is_redhat: - bash('yum -y install git python-pip mysql-devel gcc automake autoconf python-devel vim sshpass') + bash('yum -y install git python-pip mysql-devel gcc automake autoconf python-devel vim sshpass lrzsz readline-devel') if self._is_ubuntu: - bash("apt-get -y --force-yes install git python-pip gcc automake autoconf vim sshpass libmysqld-dev python-all-dev") + bash("apt-get -y --force-yes install git python-pip gcc automake autoconf vim sshpass libmysqld-dev python-all-dev lrzsz libreadline-dev") @staticmethod diff --git a/install/next.py b/install/next.py index 9c3250714..5d7da10f6 100755 --- a/install/next.py +++ b/install/next.py @@ -99,7 +99,7 @@ class Setup(object): color_print('安装成功，请访问web, 祝你使用愉快。\n请访问 https://github.com/jumpserver/jumpserver 查看文档', 'green') def start(self): - print "开始安装Jumpserver, 要求环境为 CentOS 6.5 x86_64" + print "开始安装Jumpserver ..." self._pull() self._sync_db() self._input_admin() From ccd1a10892b91443370da75aa1390b218b07554e Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sun, 28 Feb 2016 15:01:55 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80compatable?= =?UTF-8?q?=20centos7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. use systemctl stop firewalld 2. add dependence: readline-devel and lrzsz --- install/install.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install/install.py b/install/install.py index 2272a84a5..8d85781c7 100755 --- a/install/install.py +++ b/install/install.py @@ -152,15 +152,18 @@ class PreSetup(object): def _set_env(self): color_print('开始关闭防火墙和selinux', 'green') if self._is_redhat: - os.system("export LANG='en_US.UTF-8' && sed -i 's/LANG=.*/LANG=en_US.UTF-8/g' /etc/sysconfig/i18n") + os.system("export LANG='en_US.UTF-8'") if self._is_centos7: cmd1 = "systemctl status firewalld 2> /dev/null 1> /dev/null" cmd2 = "systemctl stop firewalld" cmd3 = "systemctl disable firewalld" bash('%s && %s && %s' % (cmd1, cmd2, cmd3)) + bash('localectl set-locale LANG=en_US.UTF-8') bash('setenforce 0') else: + bash("sed -i 's/LANG=.*/LANG=en_US.UTF-8/g' /etc/sysconfig/i18n") bash('service iptables stop && chkconfig iptables off && setenforce 0') + if self._is_ubuntu: os.system("export LANG='en_US.UTF-8'") bash("which iptables && iptables -F") From ad3178fe947b8d722baf5a02e77ab1a220519023 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sun, 28 Feb 2016 15:23:14 +0800 Subject: [PATCH 08/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80compatable?= =?UTF-8?q?=20centos7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. use systemctl stop firewalld 2. add dependence: readline-devel and lrzsz --- install/install.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/install/install.py b/install/install.py index 8d85781c7..4c89e087a 100755 --- a/install/install.py +++ b/install/install.py @@ -82,6 +82,7 @@ class PreSetup(object): self.key = ''.join(random.choice(string.ascii_lowercase + string.digits) \ for _ in range(16)) self.dist = platform.dist()[0].lower() + self.version = platform.dist()[1] @property def _is_redhat(self): @@ -90,10 +91,8 @@ class PreSetup(object): @property def _is_centos7(self): - version = platform.dist()[1] - if self._is_redhat: - if version.startswith("7"): - return True + if self.dist == "centos" and self.version.startswith("7"): + return True @property def _is_ubuntu(self): From 04821a00f86834e0a4070886a0ce5a198ee61842 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sun, 28 Feb 2016 15:47:39 +0800 Subject: [PATCH 09/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80compatable?= =?UTF-8?q?=20centos7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. use systemctl stop firewalld 2. add dependence: readline-devel and lrzsz 3. use mariadb as mysql server --- install/install.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/install/install.py b/install/install.py index 4c89e087a..964926c53 100755 --- a/install/install.py +++ b/install/install.py @@ -128,9 +128,14 @@ class PreSetup(object): color_print('开始安装设置mysql (请手动设置mysql安全)', 'green') color_print('默认用户名: %s 默认密码: %s' % (self.db_user, self.db_pass), 'green') if self._is_redhat: - bash('yum -y install mysql-server') - bash('service mysqld start') - bash('chkconfig mysqld on') + if self._is_centos7: + bash('yum -y install mariadb-server mariadb-devel') + bash('systemctl enable mariadb.service') + bash('systemctl start mariadb.service') + else: + bash('yum -y install mysql-server') + bash('service mysqld start') + bash('chkconfig mysqld on') bash('mysql -e "create database %s default charset=utf8"' % self.db) bash('mysql -e "grant all on %s.* to \'%s\'@\'%s\' identified by \'%s\'"' % (self.db, self.db_user, From 247e5e7f2441cc557482504c367b1c6668ca04e1 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Sun, 28 Feb 2016 15:55:21 +0800 Subject: [PATCH 10/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80little=20u?= =?UTF-8?q?pdate=20to=20contain=20liuzheng=20pr.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 请输入数据库服务器用户 [root] , 修改成　[jumpserver] --- install/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install.py b/install/install.py index 964926c53..c08ec957d 100755 --- a/install/install.py +++ b/install/install.py @@ -232,7 +232,7 @@ class PreSetup(object): else: db_host = raw_input('请输入数据库服务器IP [127.0.0.1]: ').strip() db_port = raw_input('请输入数据库服务器端口 [3306]: ').strip() - db_user = raw_input('请输入数据库服务器用户 [root]: ').strip() + db_user = raw_input('请输入数据库服务器用户 [jumpserver]: ').strip() db_pass = raw_input('请输入数据库服务器密码: ').strip() db = raw_input('请输入使用的数据库 [jumpserver]: ').strip() From a95e1bb835867ab0d9737eaa31d4ff959577726c Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Mon, 29 Feb 2016 09:52:10 +0800 Subject: [PATCH 11/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80compatible?= =?UTF-8?q?=20fedora?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. compatible fedora (test fedora22) --- install/install.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/install/install.py b/install/install.py index c08ec957d..6ed0a6add 100755 --- a/install/install.py +++ b/install/install.py @@ -94,6 +94,11 @@ class PreSetup(object): if self.dist == "centos" and self.version.startswith("7"): return True + @property + def _is_fedora_new(self): + if self.dist == "fedora" and int(self.version) >= 20: + return True + @property def _is_ubuntu(self): if self.dist == "ubuntu" or self.dist == "debian": @@ -128,7 +133,7 @@ class PreSetup(object): color_print('开始安装设置mysql (请手动设置mysql安全)', 'green') color_print('默认用户名: %s 默认密码: %s' % (self.db_user, self.db_pass), 'green') if self._is_redhat: - if self._is_centos7: + if self._is_centos7 or self._is_fedora_new: bash('yum -y install mariadb-server mariadb-devel') bash('systemctl enable mariadb.service') bash('systemctl start mariadb.service') @@ -157,7 +162,7 @@ class PreSetup(object): color_print('开始关闭防火墙和selinux', 'green') if self._is_redhat: os.system("export LANG='en_US.UTF-8'") - if self._is_centos7: + if self._is_centos7 or self._is_fedora_new: cmd1 = "systemctl status firewalld 2> /dev/null 1> /dev/null" cmd2 = "systemctl stop firewalld" cmd3 = "systemctl disable firewalld" @@ -171,7 +176,7 @@ class PreSetup(object): if self._is_ubuntu: os.system("export LANG='en_US.UTF-8'") bash("which iptables && iptables -F") - bash('which selinux && setenforce 0') + bash('which setenforce && setenforce 0') def _test_db_conn(self): bash("pip install mysql-python") From 427fda1015249a5838d9860f2ab4e9e89fc806e8 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Mon, 29 Feb 2016 10:09:05 +0800 Subject: [PATCH 12/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80compatible?= =?UTF-8?q?=20fedora?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. compatible fedora (test fedora22) --- install/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install.py b/install/install.py index 6ed0a6add..234a9235f 100755 --- a/install/install.py +++ b/install/install.py @@ -168,7 +168,7 @@ class PreSetup(object): cmd3 = "systemctl disable firewalld" bash('%s && %s && %s' % (cmd1, cmd2, cmd3)) bash('localectl set-locale LANG=en_US.UTF-8') - bash('setenforce 0') + bash('which setenforce 2> /dev/null 1> /dev/null && setenforce 0') else: bash("sed -i 's/LANG=.*/LANG=en_US.UTF-8/g' /etc/sysconfig/i18n") bash('service iptables stop && chkconfig iptables off && setenforce 0') From 1f9337feca98e3f1d57ada9d6ad483fc264887a9 Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Mon, 29 Feb 2016 10:58:31 +0800 Subject: [PATCH 13/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80compatible?= =?UTF-8?q?=20fedora?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. mysql-python编译不过, 添加rpm-build 依赖 --- install/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install.py b/install/install.py index 234a9235f..1f174f915 100755 --- a/install/install.py +++ b/install/install.py @@ -215,7 +215,7 @@ class PreSetup(object): def _depend_rpm(self): color_print('开始安装依赖包', 'green') if self._is_redhat: - bash('yum -y install git python-pip mysql-devel gcc automake autoconf python-devel vim sshpass lrzsz readline-devel') + bash('yum -y install git python-pip mysql-devel rpm-build gcc automake autoconf python-devel vim sshpass lrzsz readline-devel') if self._is_ubuntu: bash("apt-get -y --force-yes install git python-pip gcc automake autoconf vim sshpass libmysqld-dev python-all-dev lrzsz libreadline-dev") From 50e82c5b99c8fdf017b715d5856945dc749fe80c Mon Sep 17 00:00:00 2001 From: yumaojun <719118794@qq.com> Date: Mon, 29 Feb 2016 11:08:48 +0800 Subject: [PATCH 14/14] =?UTF-8?q?fix=20(install.py):=20=E3=80=80=E6=9B=B4?= =?UTF-8?q?=E6=96=B0wiki=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/install.py b/install/install.py index 1f174f915..633e80ace 100755 --- a/install/install.py +++ b/install/install.py @@ -1,7 +1,6 @@ #!/usr/bin/python # coding: utf-8 -import subprocess import time import os import sys @@ -271,7 +270,7 @@ class PreSetup(object): print def start(self): - color_print('请务必先查看wiki https://github.com/ibuler/jumpserver/wiki/Quickinstall') + color_print('请务必先查看wiki https://github.com/jumpserver/jumpserver/wiki') time.sleep(3) self.check_platform() self._rpm_repo()