diff --git a/.gitignore b/.gitignore index 983fedd49..e300831e4 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ nosetests.xml .mr.developer.cfg .project .pydevproject +.settings *.log logs/* keys/* diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 1d3924f23..000000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/connect.py=UTF-8 diff --git a/connect.py b/connect.py index fefa079f6..0be5abdfb 100755 --- a/connect.py +++ b/connect.py @@ -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: diff --git a/install/next.py b/install/next.py index 2a8231b38..e3dc312fa 100755 --- a/install/next.py +++ b/install/next.py @@ -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():