diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py index cb6f7670c..b9ff532fe 100644 --- a/apps/jumpserver/settings.py +++ b/apps/jumpserver/settings.py @@ -54,7 +54,7 @@ INSTALLED_APPS = [ 'users.apps.UsersConfig', 'assets.apps.AssetsConfig', 'perms.apps.PermsConfig', - 'webterminal.apps.WebterminalConfig', + 'terminal.apps.TerminalConfig', 'ops.apps.OpsConfig', 'audits.apps.AuditsConfig', 'common.apps.CommonConfig', diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index e593e60a8..21b144da8 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -25,7 +25,7 @@ urlpatterns = [ url(r'^(api/)?users/', include('users.urls')), url(r'^assets/', include('assets.urls')), url(r'^perms/', include('perms.urls')), - url(r'^terminal/', include('webterminal.urls')), + url(r'^terminal/', include('terminal.urls')), ] diff --git a/apps/webterminal/__init__.py b/apps/terminal/__init__.py similarity index 100% rename from apps/webterminal/__init__.py rename to apps/terminal/__init__.py diff --git a/apps/webterminal/admin.py b/apps/terminal/admin.py similarity index 100% rename from apps/webterminal/admin.py rename to apps/terminal/admin.py diff --git a/apps/webterminal/apps.py b/apps/terminal/apps.py similarity index 55% rename from apps/webterminal/apps.py rename to apps/terminal/apps.py index 0e6932f9a..c81fa232b 100644 --- a/apps/webterminal/apps.py +++ b/apps/terminal/apps.py @@ -3,5 +3,5 @@ from __future__ import unicode_literals from django.apps import AppConfig -class WebterminalConfig(AppConfig): - name = 'webterminal' +class TerminalConfig(AppConfig): + name = 'terminal' diff --git a/apps/webterminal/models.py b/apps/terminal/models.py similarity index 100% rename from apps/webterminal/models.py rename to apps/terminal/models.py diff --git a/apps/webterminal/templates/main.html b/apps/terminal/templates/main.html similarity index 100% rename from apps/webterminal/templates/main.html rename to apps/terminal/templates/main.html diff --git a/apps/webterminal/tests.py b/apps/terminal/tests.py similarity index 100% rename from apps/webterminal/tests.py rename to apps/terminal/tests.py diff --git a/apps/terminal/urls.py b/apps/terminal/urls.py new file mode 100644 index 000000000..6afe754bc --- /dev/null +++ b/apps/terminal/urls.py @@ -0,0 +1,10 @@ +# coding:utf-8 +from django.conf.urls import url + +import views + +app_name = 'terminal' + +urlpatterns = [ + url(r'^web-terminal$', views.TerminalView.as_view(), name='web-terminal'), +] diff --git a/apps/webterminal/views.py b/apps/terminal/views.py similarity index 100% rename from apps/webterminal/views.py rename to apps/terminal/views.py diff --git a/apps/webterminal/urls.py b/apps/webterminal/urls.py deleted file mode 100644 index b8c6af98a..000000000 --- a/apps/webterminal/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -# coding:utf-8 -from django.conf.urls import url -from .views import * -from django.contrib import admin -admin.autodiscover() - -app_name = 'webterminal' - -urlpatterns = [ - url(r'^$', TerminalView.as_view(), name='webterminal'), -] \ No newline at end of file diff --git a/connect.py b/connect.py new file mode 100644 index 000000000..f93d0bec7 --- /dev/null +++ b/connect.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# + + +if __name__ == '__main__': + pass diff --git a/server.py b/server.py new file mode 100644 index 000000000..f93d0bec7 --- /dev/null +++ b/server.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# + + +if __name__ == '__main__': + pass