update for pull#47

pull/47/head
iambocai bob.chen.cs@gmail.com 2016-02-17 15:16:36 +08:00
parent 0b79f754f9
commit fa195c3808
4 changed files with 4 additions and 4 deletions

1
.gitignore vendored
View File

@ -37,6 +37,7 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
.settings
*.log
logs/*
keys/*

View File

@ -1,2 +0,0 @@
eclipse.preferences.version=1
encoding/connect.py=UTF-8

View File

@ -583,7 +583,8 @@ class Nav(object):
elif len(roles) == 1: # 授权角色数为1
role = roles[0]
else:
color_print('当前用户未被授予角色,无法执行任何操作,如有疑问请联系管理员。', exits=True)
color_print('当前用户未被授予角色,无法执行任何操作,如有疑问请联系管理员。')
return
assets = list(self.user_perm.get('role', {}).get(role).get('asset')) # 获取该用户,角色授权主机
print "授权包含该系统用户的所有主机"
for asset in assets:

View File

@ -83,8 +83,8 @@ class Setup(object):
@staticmethod
def _cp_zzsh():
os.chdir(os.path.join(jms_dir, 'install'))
bash("sed -i 's#/opt/jumpserver#%s#g' zzjumpserver.sh" % jms_dir)
shutil.copy('zzjumpserver.sh', '/etc/profile.d/')
bash("sed -i 's#/opt/jumpserver#%s#g' /etc/profile.d/zzjumpserver.sh" % jms_dir)
@staticmethod
def _run_service():