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
95b2703e
Unverified
Commit
95b2703e
authored
6 years ago
by
wojiushixiaobai
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1879 from wojiushixiaobai/docs
[Update]更新1.4.2文档
parents
ab01e344
205b988c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
67 additions
and
7 deletions
+67
-7
change_log.rst
docs/change_log.rst
+7
-0
distributed_02.rst
docs/distributed_02.rst
+9
-1
dockerinstall.rst
docs/dockerinstall.rst
+1
-1
setup_by_centos7.rst
docs/setup_by_centos7.rst
+9
-1
setup_by_local.rst
docs/setup_by_local.rst
+8
-0
setup_by_ubuntu.rst
docs/setup_by_ubuntu.rst
+9
-1
step_by_step.rst
docs/step_by_step.rst
+9
-1
upgrade.rst
docs/upgrade.rst
+15
-2
No files found.
docs/change_log.rst
View file @
95b2703e
...
...
@@ -256,3 +256,10 @@
* 增加ssh用户黑名单和白名单
* luna支持搜索支持IP
* 优化一些内容
1.4.2
------------------------
2018年10月8日
* 支持web sftp,支持跨资产复制粘贴文件
* 优化一些内容
This diff is collapsed.
Click to expand it.
docs/distributed_02.rst
View file @
95b2703e
...
...
@@ -52,7 +52,7 @@
# 下载 luna
$ cd /opt
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
1
/luna.tar.gz
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
2
/luna.tar.gz
$ tar xvf luna.tar.gz
$ chown -R root:root luna
...
...
@@ -188,6 +188,14 @@
# proxy_next_upstream http_500 http_502 http_503 http_504 http_404;
}
location /coco/ {
proxy_pass http://cocows/coco/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log off;
}
location /guacamole/ {
proxy_pass http://guacamole/; # guacamole
proxy_buffering off;
...
...
This diff is collapsed.
Click to expand it.
docs/dockerinstall.rst
View file @
95b2703e
...
...
@@ -4,7 +4,7 @@ Docker 安装
Jumpserver 封装了一个 All in one Docker,可以快速启动。该镜像集成了所需要的组件(Windows组件未暂未集成),也支持使用外置 Database 和 Redis
Tips: 不建议在生产中使用, 因为所有软件都打包到一个Docker中了,不是Docker最佳实践,
生产中请使用 详细安装 `CentOS <step_by_step.
html>`_ `Ubuntu <setup_by_ubuntu.html
>`_
生产中请使用 详细安装 `CentOS <step_by_step.
rst>`_ `Ubuntu <setup_by_ubuntu.rst
>`_
Docker 安装见: `Docker官方安装文档 <https://docs.docker.com/install/>`_
...
...
This diff is collapsed.
Click to expand it.
docs/setup_by_centos7.rst
View file @
95b2703e
...
...
@@ -301,7 +301,7 @@ CentOS 7 安装文档
# 安装 Web Terminal 前端: Luna 需要 Nginx 来运行访问 访问(https://github.com/jumpserver/luna/releases)下载对应版本的 release 包,直接解压,不需要编译
$ cd /opt
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
1
/luna.tar.gz
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
2
/luna.tar.gz
$ tar xvf luna.tar.gz
$ chown -R root:root luna
...
...
@@ -351,6 +351,14 @@ CentOS 7 安装文档
access_log off;
}
location /coco/ {
proxy_pass http://localhost:5000/coco/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log off;
}
location /guacamole/ {
proxy_pass http://localhost:8081/; # 如果docker安装在别的服务器, 请填写它的ip
proxy_buffering off;
...
...
This diff is collapsed.
Click to expand it.
docs/setup_by_local.rst
View file @
95b2703e
...
...
@@ -355,6 +355,14 @@ CentOS 7 组件离线安装文档
access_log off;
}
location /coco/ {
proxy_pass http://localhost:5000/coco/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log off;
}
location /guacamole/ {
proxy_pass http://localhost:8081/; # 如果docker安装在别的服务器, 请填写它的ip
proxy_buffering off;
...
...
This diff is collapsed.
Click to expand it.
docs/setup_by_ubuntu.rst
View file @
95b2703e
...
...
@@ -370,7 +370,7 @@ Luna 已改为纯前端,需要 Nginx 来运行访问
::
$ cd /opt/
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
1
/luna.tar.gz
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
2
/luna.tar.gz
$ tar xvf luna.tar.gz
$ chown -R root:root luna
...
...
@@ -461,6 +461,14 @@ Luna 已改为纯前端,需要 Nginx 来运行访问
access_log off;
}
location /coco/ {
proxy_pass http://localhost:5000/coco/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log off;
}
location /guacamole/ {
proxy_pass http://localhost:8081/; # 如果guacamole安装在别的服务器,请填写它的ip
proxy_buffering off;
...
...
This diff is collapsed.
Click to expand it.
docs/step_by_step.rst
View file @
95b2703e
...
...
@@ -406,7 +406,7 @@ Luna 已改为纯前端,需要 Nginx 来运行访问
::
$ cd /opt
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
1
/luna.tar.gz
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
2
/luna.tar.gz
$ tar xvf luna.tar.gz
$ chown -R root:root luna
...
...
@@ -508,6 +508,14 @@ Luna 已改为纯前端,需要 Nginx 来运行访问
access_log off;
}
location /coco/ {
proxy_pass http://localhost:5000/coco/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log off;
}
location /guacamole/ {
proxy_pass http://localhost:8081/; # 如果guacamole安装在别的服务器,请填写它的ip
proxy_buffering off;
...
...
This diff is collapsed.
Click to expand it.
docs/upgrade.rst
View file @
95b2703e
...
...
@@ -52,7 +52,20 @@
$ cd ../utils && sh make_migrations.sh
$ cd ../ && ./jms start all
# 任意版本升级到 1.4.2 版本,需要修改 nginx 配置
$ vim /etc/nginx/conf.d/jumpserver.conf
...
location /coco/ {
proxy_pass http://localhost:5000/coco/;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
access_log off;
}
...
2. 升级 Coco(如果是新开的终端,别忘了 source /opt/py3/bin/activate)
::
...
...
@@ -76,7 +89,7 @@
::
$ cd /opt
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
1
/luna.tar.gz
$ wget https://github.com/jumpserver/luna/releases/download/1.4.
2
/luna.tar.gz
$ tar xvf luna.tar.gz
$ chown -R root:root luna
...
...
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