Merge branch 'sh1' into sh

connect.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # coding: utf-8
 
 import sys

install/next.py

@@ -81,9 +81,9 @@ class Setup(object):
         os.system('id %s &> /dev/null || useradd %s' % (self.admin_user, self.admin_user))
 
     @staticmethod
-    def _cp_zzsh():
-        os.chdir(os.path.join(jms_dir, 'install'))
-        shutil.copy('zzjumpserver.sh', '/etc/profile.d/')
+    def _ensure_sh():
+        jshell = os.path.join(jms_dir, 'connect.py')
+        os.chmod(jshell, 0755)
 
     @staticmethod
     def _run_service():
@@ -97,7 +97,7 @@ class Setup(object):
         self._sync_db()
         self._input_admin()
         self._create_admin()
-        self._cp_zzsh()
+        self._ensure_sh()
         self._run_service()
 
 

install/zzjumpserver.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [ "$USER" == "admin" ] || [ "$USER" == "root" ] || [ "$USER" == "" ];then
-    echo ""
-else
-    python /opt/jumpserver/connect.py
-    if [ $USER == 'guanghongwei' ];then
-        echo
-    else
-        exit 3
-        echo
-    fi
-fi

juser/user_api.py

@@ -151,7 +151,7 @@ def server_add_user(username, password, ssh_key_pwd='', ssh_key_login_need=True)
     add a system user in jumpserver
     在jumpserver服务器上添加一个用户
     """
-    bash("useradd '%s'; echo '%s'; echo '%s' | passwd --stdin '%s'" % (username, password, password, username))
+    bash("useradd -s /opt/jumpserver/connect.py '%s'; echo '%s'; echo '%s' | passwd --stdin '%s'" % (username, password, password, username))
     if ssh_key_login_need:
         gen_ssh_key(username, ssh_key_pwd)