Permalink
Browse files

update for pull#47

  • Loading branch information...
1 parent 0b79f75 commit fa195c3808717cfe328f6cc8b339552f6670318d @iambocai iambocai committed Feb 17, 2016
Showing with 4 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +0 −2 .settings/org.eclipse.core.resources.prefs
  3. +2 −1 connect.py
  4. +1 −1 install/next.py
View
@@ -37,6 +37,7 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject
+.settings
*.log
logs/*
keys/*
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/connect.py=UTF-8
View
@@ -583,7 +583,8 @@ def exec_cmd(self):
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
@@ -83,8 +83,8 @@ def _create_admin(self):
@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():

0 comments on commit fa195c3

Please sign in to comment.