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
232674b1
Unverified
Commit
232674b1
authored
6 years ago
by
老广
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2423 from jumpserver/dev
Dev
parents
904a0f67
ddf60d25
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
9 deletions
+28
-9
__init__.py
apps/__init__.py
+1
-1
_footer.html
apps/templates/_footer.html
+1
-1
entrypoint.sh
entrypoint.sh
+9
-4
jms
jms
+17
-3
No files found.
apps/__init__.py
View file @
232674b1
...
...
@@ -2,4 +2,4 @@
# -*- coding: utf-8 -*-
#
__version__
=
"1.4.
7
"
__version__
=
"1.4.
8
"
This diff is collapsed.
Click to expand it.
apps/templates/_footer.html
View file @
232674b1
{% load i18n %}
<div
class=
"footer fixed"
>
<div
class=
"pull-right"
>
Version
<strong>
1.4.
7
-{% include '_build.html' %}
</strong>
GPLv2.
Version
<strong>
1.4.
8
-{% include '_build.html' %}
</strong>
GPLv2.
<!--<img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">-->
</div>
<div>
...
...
This diff is collapsed.
Click to expand it.
entrypoint.sh
View file @
232674b1
...
...
@@ -2,15 +2,20 @@
function
cleanup
()
{
local
pids
=
`
jobs
-p
`
if
[[
"
$
pids
"
!=
""
]]
;
then
kill
$
pids
>
/dev/null 2>/dev/null
if
[[
"
$
{
pids
}
"
!=
""
]]
;
then
kill
$
{
pids
}
>
/dev/null 2>/dev/null
fi
}
service
=
"all"
if
[
"
$1
"
!=
""
]
;
then
if
[
[
"
$1
"
!=
""
]
]
;
then
service
=
$1
fi
trap
cleanup EXIT
python jms start
$service
if
[[
"
$1
"
==
"bash"
]]
;
then
bash
else
python jms start
${
service
}
fi
This diff is collapsed.
Click to expand it.
jms
View file @
232674b1
...
...
@@ -10,14 +10,28 @@ import sys
import
signal
BASE_DIR
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
))
sys
.
path
.
append
(
BASE_DIR
)
sys
.
path
.
insert
(
0
,
BASE_DIR
)
from
apps
import
__version__
try
:
from
apps
import
__version__
except
ImportError
as
e
:
print
(
"Not found __version__: {}"
.
format
(
e
))
print
(
"Sys path: {}"
.
format
(
sys
.
path
))
print
(
"Python is: "
)
print
(
subprocess
.
call
(
'which python'
,
shell
=
True
))
__version__
=
'Unknown'
try
:
import
apps
print
(
"List apps: {}"
.
format
(
os
.
listdir
(
'apps'
)))
print
(
'apps is: {}'
.
format
(
apps
))
except
:
pass
try
:
from
apps.jumpserver.conf
import
load_user_config
CONFIG
=
load_user_config
()
except
ImportError
:
except
ImportError
as
e
:
print
(
"Import error: {}"
.
format
(
e
))
print
(
"Could not find config file, `cp config_example.yml config.yml`"
)
sys
.
exit
(
1
)
...
...
This diff is collapsed.
Click to expand it.
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