From c0bacb7c7cf1bdff0a9289347c57cc3c13a65e62 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 3 Mar 2016 18:16:11 +0800 Subject: [PATCH] =?UTF-8?q?change(with=20pre=20fix)=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=92=8Cjumpserver.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上次修改已可以自动获取 ws地址，去掉无用设置和配置文件指定 去掉install.py中的设置 --- install/install.py | 1 - jumpserver.conf | 1 - jumpserver/settings.py | 1 - jumpserver/views.py | 2 -- 4 files changed, 5 deletions(-) diff --git a/install/install.py b/install/install.py index f0fe98f94..c5b763bd6 100755 --- a/install/install.py +++ b/install/install.py @@ -119,7 +119,6 @@ class PreSetup(object): conf = ConfigParser.ConfigParser() conf.read(conf_file) conf.set('base', 'url', 'http://%s' % self.ip) - conf.set('base', 'websocket_url', 'ws://%s' % self.ip) conf.set('base', 'key', self.key) conf.set('db', 'host', self.db_host) conf.set('db', 'port', self.db_port) diff --git a/jumpserver.conf b/jumpserver.conf index a24203220..cee5fd8e5 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -1,6 +1,5 @@ [base] url = http://192.168.244.129 -websocket_url = ws://192.168.244.129 key = i6k2zeu8x6mncl76 ip = 0.0.0.0 port = 80 diff --git a/jumpserver/settings.py b/jumpserver/settings.py index 3b9a9cadb..54d2e835d 100644 --- a/jumpserver/settings.py +++ b/jumpserver/settings.py @@ -41,7 +41,6 @@ SSH_KEY_DIR = os.path.join(BASE_DIR, 'keys/role_keys') KEY = config.get('base', 'key') URL = config.get('base', 'url') LOG_LEVEL = config.get('base', 'log') -WEB_SOCKET_URL = config.get('base', 'websocket_url') IP = config.get('base', 'ip') PORT = config.get('base', 'port') diff --git a/jumpserver/views.py b/jumpserver/views.py index ab97a66e8..70476d1a1 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -354,9 +354,7 @@ def web_terminal(request): role_name = request.GET.get('role') asset = get_object(Asset, id=asset_id) if asset: - print asset hostname = asset.hostname - web_terminal_url = '%s/ws/terminal?id=%s&role=%s' % (WEB_SOCKET_URL, asset_id, role_name) return render_to_response('jlog/web_terminal.html', locals())