Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
d67aab57
Commit
d67aab57
authored
Feb 26, 2016
by
liuzheng712
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: ip and port use jumpserver.conf to configure
parent
0b9b94bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
jumpserver.conf
jumpserver.conf
+2
-0
settings.py
jumpserver/settings.py
+2
-0
run_websocket.py
run_websocket.py
+3
-2
No files found.
jumpserver.conf
View file @
d67aab57
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
url
=
http
://
192
.
168
.
244
.
129
url
=
http
://
192
.
168
.
244
.
129
key
=
88
aaaf7ffe3c6c04
key
=
88
aaaf7ffe3c6c04
log
=
debug
log
=
debug
ip
=
127
.
0
.
0
.
1
port
=
8080
[
db
]
[
db
]
host
=
127
.
0
.
0
.
1
host
=
127
.
0
.
0
.
1
...
...
jumpserver/settings.py
View file @
d67aab57
...
@@ -42,6 +42,8 @@ KEY = config.get('base', 'key')
...
@@ -42,6 +42,8 @@ KEY = config.get('base', 'key')
URL
=
config
.
get
(
'base'
,
'url'
)
URL
=
config
.
get
(
'base'
,
'url'
)
LOG_LEVEL
=
config
.
get
(
'base'
,
'log'
)
LOG_LEVEL
=
config
.
get
(
'base'
,
'log'
)
WEB_SOCKET_HOST
=
config
.
get
(
'websocket'
,
'web_socket_host'
)
WEB_SOCKET_HOST
=
config
.
get
(
'websocket'
,
'web_socket_host'
)
IP
=
config
.
get
(
'base'
,
'ip'
)
PORT
=
config
.
get
(
'base'
,
'port'
)
# Quick-start development settings - unsuitable for production
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
...
...
run_websocket.py
View file @
d67aab57
...
@@ -33,8 +33,9 @@ except ImportError:
...
@@ -33,8 +33,9 @@ except ImportError:
import
json
import
json
os
.
environ
[
'DJANGO_SETTINGS_MODULE'
]
=
'jumpserver.settings'
os
.
environ
[
'DJANGO_SETTINGS_MODULE'
]
=
'jumpserver.settings'
define
(
"port"
,
default
=
3000
,
help
=
"run on the given port"
,
type
=
int
)
from
jumpserver.settings
import
IP
,
PORT
define
(
"host"
,
default
=
'0.0.0.0'
,
help
=
"run port on given host"
,
type
=
str
)
define
(
"port"
,
default
=
PORT
,
help
=
"run on the given port"
,
type
=
int
)
define
(
"host"
,
default
=
IP
,
help
=
"run port on given host"
,
type
=
str
)
def
require_auth
(
role
=
'user'
):
def
require_auth
(
role
=
'user'
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment