支持 Amazon Linux

pull/185/head
Astraeux 2016-03-31 15:14:41 +08:00
parent edad26e05b
commit f8fac06e1b
3 changed files with 9 additions and 9 deletions

View File

@ -4,10 +4,10 @@
#欢迎使用Jumpserver #欢迎使用Jumpserver
**Jumpserver** 是一款由python编写开源的跳板机(堡垒机)系统实现了跳板机应有的功能。基于ssh协议来管理客户端无需安装agent。 **Jumpserver** 是一款由python编写开源的跳板机(堡垒机)系统实现了跳板机应有的功能。基于ssh协议来管理客户端无需安装agent。
支持常见系统: 支持常见系统:
1. redhat centos 1. CentOS, RedHat, Fedora, Amazon Linux
2. debian 2. Debian
3. suse ubuntu 3. SUSE, Ubuntu
4. freebsd 4. FreeBSD
5. 其他ssh协议硬件设备 5. 其他ssh协议硬件设备
###截图: ###截图:

View File

@ -80,12 +80,12 @@ class PreSetup(object):
self.ip = '' self.ip = ''
self.key = ''.join(random.choice(string.ascii_lowercase + string.digits) \ self.key = ''.join(random.choice(string.ascii_lowercase + string.digits) \
for _ in range(16)) for _ in range(16))
self.dist = platform.dist()[0].lower() self.dist = platform.linux_distribution(supported_dists=['system'])[0].lower()
self.version = platform.dist()[1] self.version = platform.linux_distribution(supported_dists=['system'])[1]
@property @property
def _is_redhat(self): def _is_redhat(self):
if self.dist == "centos" or self.dist == "redhat" or self.dist == "fedora": if self.dist == "centos" or self.dist == "redhat" or self.dist == "fedora" or self.dist == "amazon linux ami":
return True return True
@property @property
@ -105,7 +105,7 @@ class PreSetup(object):
def check_platform(self): def check_platform(self):
if not (self._is_redhat or self._is_ubuntu): if not (self._is_redhat or self._is_ubuntu):
print(u"支持的平台: CentOS, RedHat, Fedora, Debian, Ubuntu, 暂不支持其他平台安装.") print(u"支持的平台: CentOS, RedHat, Fedora, Debian, Ubuntu, Amazon Linux, 暂不支持其他平台安装.")
exit() exit()
@staticmethod @staticmethod

View File

@ -109,7 +109,7 @@
timely: 2, timely: 2,
theme: "yellow_right_effect", theme: "yellow_right_effect",
rules: { rules: {
check_name: [/^\w{2,20}$/, '大小写字母数字和下划线,2-20位'], check_name: [/^(\w|\-){2,20}$/, '大小写字母、数字、中划线和下划线,2-20位'],
check_port: [/^\d{1,5}$/, '端口号不正确'], check_port: [/^\d{1,5}$/, '端口号不正确'],
either: function(){ either: function(){
return $('#password').val() == '' return $('#password').val() == ''