Skip to content

J
jumpserver
Unverified Commit aa2574de authored by wojiushixiaobai's avatar wojiushixiaobai Committed by GitHub
Browse files
Options

Merge pull request #2748 from wojiushixiaobai/docs 

 [Update]更新1.5.0文档
parents 034d4862 ddedc7d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 68 deletions
docs/change_log.rst
View file @ aa2574de
更新日志 更新日志
=========== ===========
1.5.0
------------------------
2019年5月29日
**新增功能**
* 支持启用MFA的管理员查看资产用户密码
* 可自定义创建用户时发送创建用户成功的邮件内容
* 创建用户时，可选择用户密码设置策略(可解决客户没有邮件系统的场景)
* (用户/用户组/资产/管理用户/系统用户)资源支持使用csv文件类型进行导入、导出、更新操作
* LDAP支持SSL (pem路径 jumpserver/data/certs/ldap_ca.pem)
* 支持Option方法请求API获取对应其他HTTP方法的所需的字段说明
* 支持RemoteApp
**功能优化**
* 创建资产时允许ip字段填写为host地址
* OpenID Middleware去掉输出日志
* 资产节点API添加search功能
* 解决ldap映射is_active等字段为bool值的问题(可解决LDAP禁用用户后，同时禁止用户登录Jumpserver的场景)
**Bug修复**
* 修复LDAP不能导入用户名中包含空各的用户
* 修复LDAP可导入跨页面选取的所有用户
* 修复资产用户管理器获取用户名为""的对象时返回多个结果的bug
1.4.10 1.4.10
------------------------ ------------------------
2019年4月30日 2019年4月30日
......
docs/distributed_02.rst
View file @ aa2574de
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
# 下载 luna # 下载 luna
$ cd /opt $ cd /opt
$ wget https://github.com/jumpserver/luna/releases/download/1.4.10/luna.tar.gz $ wget https://github.com/jumpserver/luna/releases/download/1.5.0/luna.tar.gz
# 如果网络有问题导致下载无法完成可以使用下面地址 # 如果网络有问题导致下载无法完成可以使用下面地址
$ wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz $ wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz
$ tar xf luna.tar.gz $ tar xf luna.tar.gz
$ chown -R root:root luna $ chown -R root:root luna
......
docs/distributed_06.rst
View file @ aa2574de
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
-p 5000:5000 \ -p 5000:5000 \
-e CORE_HOST=http://192.168.100.30:8080 \ -e CORE_HOST=http://192.168.100.30:8080 \
-e BOOTSTRAP_TOKEN=你的token \ -e BOOTSTRAP_TOKEN=你的token \
jumpserver/jms_coco:1.4.10 jumpserver/jms_coco:1.5.0
# 访问 http://192.168.100.100/terminal/terminal/ 检查 coco 注册 # 访问 http://192.168.100.100/terminal/terminal/ 检查 coco 注册
...@@ -67,6 +67,6 @@ ...@@ -67,6 +67,6 @@
-p 5001:5000 \ -p 5001:5000 \
-e CORE_HOST=http://192.168.100.30:8080 \ -e CORE_HOST=http://192.168.100.30:8080 \
-e BOOTSTRAP_TOKEN=你的token \ -e BOOTSTRAP_TOKEN=你的token \
jumpserver/jms_coco:1.4.10 jumpserver/jms_coco:1.5.0
# 访问 http://192.168.100.100/terminal/terminal/ 检查 coco 注册 # 访问 http://192.168.100.100/terminal/terminal/ 检查 coco 注册
docs/distributed_07.rst
View file @ aa2574de
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
-e JUMPSERVER_KEY_DIR=/config/guacamole/key \ -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-e JUMPSERVER_SERVER=http://192.168.100.30:8080 \ -e JUMPSERVER_SERVER=http://192.168.100.30:8080 \
-e BOOTSTRAP_TOKEN=你的token \ -e BOOTSTRAP_TOKEN=你的token \
jumpserver/jms_guacamole:1.4.10 jumpserver/jms_guacamole:1.5.0
# 访问 http://192.168.100.100/terminal/terminal/ 检查 guacamole 注册 # 访问 http://192.168.100.100/terminal/terminal/ 检查 guacamole 注册
...@@ -65,6 +65,6 @@ ...@@ -65,6 +65,6 @@
-e JUMPSERVER_KEY_DIR=/config/guacamole/key \ -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-e JUMPSERVER_SERVER=http://192.168.100.30:8080 \ -e JUMPSERVER_SERVER=http://192.168.100.30:8080 \
-e BOOTSTRAP_TOKEN=你的token \ -e BOOTSTRAP_TOKEN=你的token \
jumpserver/jms_guacamole:1.4.10 jumpserver/jms_guacamole:1.5.0
# 访问 http://192.168.100.100/terminal/terminal/ 检查 guacamole 注册 # 访问 http://192.168.100.100/terminal/terminal/ 检查 guacamole 注册
docs/faq.rst
View file @ aa2574de
...@@ -221,3 +221,20 @@ FAQ ...@@ -221,3 +221,20 @@ FAQ
>>> user = User.objects.get(username='admin') >>> user = User.objects.get(username='admin')
>>> user.public_key = '明文key' >>> user.public_key = '明文key'
>>> user.save() >>> user.save()
11. 登录提示登录频繁
.. code-block:: shell
$ source /opt/py3/bin/activate
$ cd /opt/jumpserver/utils
$ sh unblock_all_user.sh
# 如果不存在 unblock_all_user.sh 文件
$ source /opt/py3/bin/activate
$ cd /opt/jumpserver/apps
$ python manage.py shell
>>> from django.core.cache import cache
>>> cache.delete_pattern('_LOGIN_BLOCK_*')
>>> cache.delete_pattern('_LOGIN_LIMIT_*')
>>> exit()
docs/faq_docker.rst
View file @ aa2574de
...@@ -97,5 +97,5 @@ Docker 使用说明 ...@@ -97,5 +97,5 @@ Docker 使用说明
# 例: # 例:
$ docker pull jumpserver/jms_all:latest $ docker pull jumpserver/jms_all:latest
$ docker pull jumpserver/jms_coco:1.4.10 $ docker pull jumpserver/jms_coco:1.5.0
$ docker pull jumpserver/jms_guacamole:1.4.10 $ docker pull jumpserver/jms_guacamole:1.5.0
docs/faq_rdp.rst
View file @ aa2574de
...@@ -33,7 +33,7 @@ RDP 协议资产连接错误排查思路 ...@@ -33,7 +33,7 @@ RDP 协议资产连接错误排查思路
# http://<Jumpserver_url> 指向 jumpserver 的服务url, 如 http://192.168.244.144:8080 # http://<Jumpserver_url> 指向 jumpserver 的服务url, 如 http://192.168.244.144:8080
# BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN # BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN
$ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=xxxxxx jumpserver/jms_guacamole:1.4.10 $ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=xxxxxx jumpserver/jms_guacamole:1.5.0
# 正常运行后到Jumpserver 会话管理-终端管理 里面查看 gua 的状态是否为绿色(等待大概5s后刷新页面) # 正常运行后到Jumpserver 会话管理-终端管理 里面查看 gua 的状态是否为绿色(等待大概5s后刷新页面)
......
docs/faq_ssh.rst
View file @ aa2574de
...@@ -30,7 +30,7 @@ SSH 协议资产连接错误排查思路 ...@@ -30,7 +30,7 @@ SSH 协议资产连接错误排查思路
# http://<Jumpserver_url> 指向 jumpserver 的服务url, 如 http://192.168.244.144:8080 # http://<Jumpserver_url> 指向 jumpserver 的服务url, 如 http://192.168.244.144:8080
# BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN # BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN
$ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=xxxxxx jumpserver/jms_coco:1.4.10 $ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=xxxxxx jumpserver/jms_coco:1.5.0
# 正常运行后到Jumpserver 会话管理-终端管理 里面查看 coco 的状态是否为绿色 # 正常运行后到Jumpserver 会话管理-终端管理 里面查看 coco 的状态是否为绿色
......
docs/setup_by_aliyuncloud.rst
View file @ aa2574de
...@@ -41,15 +41,15 @@ ...@@ -41,15 +41,15 @@
$ echo -e "\033[31m 3. 下载组件 \033[0m" \ $ echo -e "\033[31m 3. 下载组件 \033[0m" \
&& cd /opt \ && cd /opt \
&& if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \ && if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \
&& if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \ && if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \
&& yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \ && yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \
&& source /opt/py3/bin/activate \ && source /opt/py3/bin/activate \
&& pip install --upgrade pip setuptools -i https://mirrors.aliyun.com/pypi/simple/ \ && pip install --upgrade pip setuptools -i https://mirrors.aliyun.com/pypi/simple/ \
&& pip install -r /opt/jumpserver/requirements/requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ \ && pip install -r /opt/jumpserver/requirements/requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ \
&& curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \ && curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \
&& systemctl restart docker \ && systemctl restart docker \
&& docker pull jumpserver/jms_coco:1.4.10 \ && docker pull jumpserver/jms_coco:1.5.0 \
&& docker pull jumpserver/jms_guacamole:1.4.10 \ && docker pull jumpserver/jms_guacamole:1.5.0 \
&& rm -rf /etc/nginx/conf.d/default.conf \ && rm -rf /etc/nginx/conf.d/default.conf \
&& curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf && curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
&& systemctl start nginx \ && systemctl start nginx \
&& cd /opt/jumpserver \ && cd /opt/jumpserver \
&& ./jms start all -d \ && ./jms start all -d \
&& docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.4.10 \ && docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.5.0 \
&& docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.4.10 \ && docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.5.0 \
&& echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \ && echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \
&& echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \ && echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \
&& echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \ && echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \
......
docs/setup_by_centos.rst
View file @ aa2574de
...@@ -31,11 +31,6 @@ ...@@ -31,11 +31,6 @@
$ setenforce 0 $ setenforce 0
$ sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" /etc/selinux/config $ sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" /etc/selinux/config
# 修改字符集, 否则可能报 input/output error的问题, 因为日志里打印了中文
$ localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8
$ export LC_ALL=zh_CN.UTF-8
$ echo 'LANG="zh_CN.UTF-8"' > /etc/locale.conf
一. 准备 Python3 和 Python 虚拟环境 一. 准备 Python3 和 Python 虚拟环境
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...@@ -343,10 +338,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问 ...@@ -343,10 +338,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
.. code-block:: shell .. code-block:: shell
$ cd /opt $ cd /opt
$ wget https://github.com/jumpserver/luna/releases/download/1.4.10/luna.tar.gz $ wget https://github.com/jumpserver/luna/releases/download/1.5.0/luna.tar.gz
# 如果网络有问题导致下载无法完成可以使用下面地址 # 如果网络有问题导致下载无法完成可以使用下面地址
$ wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz $ wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz
$ tar xf luna.tar.gz $ tar xf luna.tar.gz
$ chown -R root:root luna $ chown -R root:root luna
......
docs/setup_by_centos7.rst
View file @ aa2574de
...@@ -38,11 +38,6 @@ CentOS 7 安装文档 ...@@ -38,11 +38,6 @@ CentOS 7 安装文档
$ setenforce 0 $ setenforce 0
$ sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" /etc/selinux/config $ sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" /etc/selinux/config
# 修改字符集, 否则可能报 input/output error的问题, 因为日志里打印了中文
$ localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8
$ export LC_ALL=zh_CN.UTF-8
$ echo 'LANG="zh_CN.UTF-8"' > /etc/locale.conf
# 安装依赖包 # 安装依赖包
$ yum -y install wget gcc epel-release git $ yum -y install wget gcc epel-release git
...@@ -216,17 +211,17 @@ CentOS 7 安装文档 ...@@ -216,17 +211,17 @@ CentOS 7 安装文档
# http://<Jumpserver_url> 指向 jumpserver 的服务端口, 如 http://192.168.244.144:8080 # http://<Jumpserver_url> 指向 jumpserver 的服务端口, 如 http://192.168.244.144:8080
# BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN # BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN
$ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.4.10 $ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.5.0
$ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.4.10 $ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.5.0
.. code-block:: shell .. code-block:: shell
# 安装 Web Terminal 前端: Luna 需要 Nginx 来运行访问 访问(https://github.com/jumpserver/luna/releases)下载对应版本的 release 包, 直接解压, 不需要编译 # 安装 Web Terminal 前端: Luna 需要 Nginx 来运行访问 访问(https://github.com/jumpserver/luna/releases)下载对应版本的 release 包, 直接解压, 不需要编译
$ cd /opt $ cd /opt
$ wget https://github.com/jumpserver/luna/releases/download/1.4.10/luna.tar.gz $ wget https://github.com/jumpserver/luna/releases/download/1.5.0/luna.tar.gz
# 如果网络有问题导致下载无法完成可以使用下面地址 # 如果网络有问题导致下载无法完成可以使用下面地址
$ wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz $ wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz
$ tar xf luna.tar.gz $ tar xf luna.tar.gz
$ chown -R root:root luna $ chown -R root:root luna
...@@ -327,13 +322,13 @@ CentOS 7 安装文档 ...@@ -327,13 +322,13 @@ CentOS 7 安装文档
.. code-block:: shell .. code-block:: shell
# coco 服务默认运行在单核心下面, 当负载过高时会导致用户访问变慢, 这时可运行多个 docker 容器缓解 # coco 服务默认运行在单核心下面, 当负载过高时会导致用户访问变慢, 这时可运行多个 docker 容器缓解
$ docker run --name jms_coco01 -d -p 2223:2222 -p 5001:5000 -e CORE_HOST=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_coco:1.4.10 $ docker run --name jms_coco01 -d -p 2223:2222 -p 5001:5000 -e CORE_HOST=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_coco:1.5.0
$ docker run --name jms_coco02 -d -p 2224:2222 -p 5002:5000 -e CORE_HOST=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_coco:1.4.10 $ docker run --name jms_coco02 -d -p 2224:2222 -p 5002:5000 -e CORE_HOST=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_coco:1.5.0
... ...
# guacamole 也是一样 # guacamole 也是一样
$ docker run --name jms_guacamole01 -d -p 8082:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_guacamole:1.4.10 $ docker run --name jms_guacamole01 -d -p 8082:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_guacamole:1.5.0
$ docker run --name jms_guacamole02 -d -p 8083:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_guacamole:1.4.10 $ docker run --name jms_guacamole02 -d -p 8083:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=****** jumpserver/jms_guacamole:1.5.0
... ...
# nginx 代理设置 # nginx 代理设置
......
docs/setup_by_huaweicloud.rst
View file @ aa2574de
...@@ -48,15 +48,15 @@ ...@@ -48,15 +48,15 @@
$ echo -e "\033[31m 3. 下载组件 \033[0m" \ $ echo -e "\033[31m 3. 下载组件 \033[0m" \
&& cd /opt \ && cd /opt \
&& if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \ && if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \
&& if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \ && if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \
&& yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \ && yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \
&& source /opt/py3/bin/activate \ && source /opt/py3/bin/activate \
&& pip install --upgrade pip setuptools -i https://mirrors.huaweicloud.com/repository/pypi/simple \ && pip install --upgrade pip setuptools -i https://mirrors.huaweicloud.com/repository/pypi/simple \
&& pip install -r /opt/jumpserver/requirements/requirements.txt -i https://mirrors.huaweicloud.com/repository/pypi/simple \ && pip install -r /opt/jumpserver/requirements/requirements.txt -i https://mirrors.huaweicloud.com/repository/pypi/simple \
&& curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \ && curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \
&& systemctl restart docker \ && systemctl restart docker \
&& docker pull jumpserver/jms_coco:1.4.10 \ && docker pull jumpserver/jms_coco:1.5.0 \
&& docker pull jumpserver/jms_guacamole:1.4.10 \ && docker pull jumpserver/jms_guacamole:1.5.0 \
&& rm -rf /etc/nginx/conf.d/default.conf \ && rm -rf /etc/nginx/conf.d/default.conf \
&& curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf && curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
&& systemctl start nginx \ && systemctl start nginx \
&& cd /opt/jumpserver \ && cd /opt/jumpserver \
&& ./jms start all -d \ && ./jms start all -d \
&& docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.4.10 \ && docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.5.0 \
&& docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.4.10 \ && docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.5.0 \
&& echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \ && echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \
&& echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \ && echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \
&& echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \ && echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \
......
docs/setup_by_localcloud.rst
View file @ aa2574de
...@@ -43,15 +43,15 @@ ...@@ -43,15 +43,15 @@
$ echo -e "\033[31m 3. 下载组件 \033[0m" \ $ echo -e "\033[31m 3. 下载组件 \033[0m" \
&& cd /opt \ && cd /opt \
&& if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \ && if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \
&& if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \ && if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \
&& yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \ && yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \
&& source /opt/py3/bin/activate \ && source /opt/py3/bin/activate \
&& pip install --upgrade pip setuptools -i https://mirrors.aliyun.com/pypi/simple/ \ && pip install --upgrade pip setuptools -i https://mirrors.aliyun.com/pypi/simple/ \
&& pip install -r /opt/jumpserver/requirements/requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ \ && pip install -r /opt/jumpserver/requirements/requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ \
&& curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \ && curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \
&& systemctl restart docker \ && systemctl restart docker \
&& docker pull jumpserver/jms_coco:1.4.10 \ && docker pull jumpserver/jms_coco:1.5.0 \
&& docker pull jumpserver/jms_guacamole:1.4.10 \ && docker pull jumpserver/jms_guacamole:1.5.0 \
&& rm -rf /etc/nginx/conf.d/default.conf \ && rm -rf /etc/nginx/conf.d/default.conf \
&& curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf && curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
&& systemctl start nginx \ && systemctl start nginx \
&& cd /opt/jumpserver \ && cd /opt/jumpserver \
&& ./jms start all -d \ && ./jms start all -d \
&& docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.4.10 \ && docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.5.0 \
&& docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.4.10 \ && docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.5.0 \
&& echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \ && echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \
&& echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \ && echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \
&& echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \ && echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \
......
docs/setup_by_tencentcloud.rst
View file @ aa2574de
...@@ -43,15 +43,15 @@ ...@@ -43,15 +43,15 @@
$ echo -e "\033[31m 3. 下载组件 \033[0m" \ $ echo -e "\033[31m 3. 下载组件 \033[0m" \
&& cd /opt \ && cd /opt \
&& if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \ && if [ ! -d "/opt/jumpserver" ]; then git clone --depth=1 https://github.com/jumpserver/jumpserver.git; fi \
&& if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \ && if [ ! -f "/opt/luna.tar.gz" ]; then wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz; tar xf luna.tar.gz; chown -R root:root luna; fi \
&& yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \ && yum -y install $(cat /opt/jumpserver/requirements/rpm_requirements.txt) \
&& source /opt/py3/bin/activate \ && source /opt/py3/bin/activate \
&& pip install --upgrade pip setuptools -i http://mirrors.tencentyun.com/pypi/simple \ && pip install --upgrade pip setuptools -i http://mirrors.tencentyun.com/pypi/simple \
&& pip install -r /opt/jumpserver/requirements/requirements.txt -i http://mirrors.tencentyun.com/pypi/simple \ && pip install -r /opt/jumpserver/requirements/requirements.txt -i http://mirrors.tencentyun.com/pypi/simple \
&& curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \ && curl -sSL https://get.daocloud.io/daotools/set_mirror.sh | sh -s http://f1361db2.m.daocloud.io \
&& systemctl restart docker \ && systemctl restart docker \
&& docker pull jumpserver/jms_coco:1.4.10 \ && docker pull jumpserver/jms_coco:1.5.0 \
&& docker pull jumpserver/jms_guacamole:1.4.10 \ && docker pull jumpserver/jms_guacamole:1.5.0 \
&& rm -rf /etc/nginx/conf.d/default.conf \ && rm -rf /etc/nginx/conf.d/default.conf \
&& curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf && curl -o /etc/nginx/conf.d/jumpserver.conf https://demo.jumpserver.org/download/nginx/conf.d/jumpserver.conf
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
&& systemctl start nginx \ && systemctl start nginx \
&& cd /opt/jumpserver \ && cd /opt/jumpserver \
&& ./jms start all -d \ && ./jms start all -d \
&& docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.4.10 \ && docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.5.0 \
&& docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.4.10 \ && docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.5.0 \
&& echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \ && echo -e "\033[31m 你的数据库密码是 $DB_PASSWORD \033[0m" \
&& echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \ && echo -e "\033[31m 你的SECRET_KEY是 $SECRET_KEY \033[0m" \
&& echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \ && echo -e "\033[31m 你的BOOTSTRAP_TOKEN是 $BOOTSTRAP_TOKEN \033[0m" \
......
docs/setup_by_ubuntu.rst
View file @ aa2574de
...@@ -30,11 +30,6 @@ ...@@ -30,11 +30,6 @@
$ apt-get update && apt-get -y upgrade $ apt-get update && apt-get -y upgrade
$ apt-get -y install wget gcc libffi-dev git libmysqlclient-dev $ apt-get -y install wget gcc libffi-dev git libmysqlclient-dev
# 修改字符集, 否则可能报 input/output error的问题, 因为日志里打印了中文
$ apt-get -y install language-pack-zh-hans
$ export LC_ALL=zh_CN.UTF-8
$ echo 'LANG="zh_CN.UTF-8"' > /etc/default/locale
**1.2 安装 Python3.6** **1.2 安装 Python3.6**
.. code-block:: shell .. code-block:: shell
...@@ -323,10 +318,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问 ...@@ -323,10 +318,10 @@ Luna 已改为纯前端, 需要 Nginx 来运行访问
.. code-block:: shell .. code-block:: shell
$ cd /opt/ $ cd /opt/
$ wget https://github.com/jumpserver/luna/releases/download/1.4.10/luna.tar.gz $ wget https://github.com/jumpserver/luna/releases/download/1.5.0/luna.tar.gz
# 如果网络有问题导致下载无法完成可以使用下面地址 # 如果网络有问题导致下载无法完成可以使用下面地址
$ wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz $ wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz
$ tar xf luna.tar.gz $ tar xf luna.tar.gz
$ chown -R root:root luna $ chown -R root:root luna
......
docs/setup_by_ubuntu18.rst
View file @ aa2574de
...@@ -31,11 +31,6 @@ Ubuntu 18.04 安装文档 ...@@ -31,11 +31,6 @@ Ubuntu 18.04 安装文档
$ apt-get update && apt-get -y upgrade $ apt-get update && apt-get -y upgrade
$ apt-get -y install wget gcc libffi-dev git $ apt-get -y install wget gcc libffi-dev git
# 修改字符集, 否则可能报 input/output error的问题, 因为日志里打印了中文
$ apt-get -y install language-pack-zh-hans
$ export LC_ALL="zh_CN.utf8"
$ echo 'LANG="zh_CN.utf8"' > /etc/default/locale
**1.2 安装 Redis, Jumpserver 使用 Redis 做 cache 和 celery broke** **1.2 安装 Redis, Jumpserver 使用 Redis 做 cache 和 celery broke**
.. code-block:: shell .. code-block:: shell
...@@ -227,7 +222,7 @@ Ubuntu 18.04 安装文档 ...@@ -227,7 +222,7 @@ Ubuntu 18.04 安装文档
.. code-block:: shell .. code-block:: shell
$ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.4.10 $ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_coco:1.5.0
# BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN # BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN
四. 安装 RDP Server 和 VNC Server: Guacamole 四. 安装 RDP Server 和 VNC Server: Guacamole
...@@ -237,7 +232,7 @@ Ubuntu 18.04 安装文档 ...@@ -237,7 +232,7 @@ Ubuntu 18.04 安装文档
.. code-block:: shell .. code-block:: shell
$ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.4.10 $ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://$Server_IP:8080 -e BOOTSTRAP_TOKEN=$BOOTSTRAP_TOKEN jumpserver/jms_guacamole:1.5.0
# BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN # BOOTSTRAP_TOKEN 为 Jumpserver/config.yml 里面的 BOOTSTRAP_TOKEN
五. 安装 Web Terminal 前端: Luna 五. 安装 Web Terminal 前端: Luna
...@@ -250,10 +245,10 @@ Ubuntu 18.04 安装文档 ...@@ -250,10 +245,10 @@ Ubuntu 18.04 安装文档
.. code-block:: shell .. code-block:: shell
$ cd /opt/ $ cd /opt/
$ wget https://github.com/jumpserver/luna/releases/download/1.4.10/luna.tar.gz $ wget https://github.com/jumpserver/luna/releases/download/1.5.0/luna.tar.gz
# 如果网络有问题导致下载无法完成可以使用下面地址 # 如果网络有问题导致下载无法完成可以使用下面地址
$ wget https://demo.jumpserver.org/download/luna/1.4.10/luna.tar.gz $ wget https://demo.jumpserver.org/download/luna/1.5.0/luna.tar.gz
$ tar xf luna.tar.gz $ tar xf luna.tar.gz
$ chown -R root:root luna $ chown -R root:root luna
......
docs/uninstall.rst
View file @ aa2574de
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
# 删除 docker 组件 # 删除 docker 组件
$ docker rm jms_coco $ docker rm jms_coco
$ docker rm jms_guacamole $ docker rm jms_guacamole
$ docker rmi jumpserver/jms_coco:1.4.10 # 自行替换版本 $ docker rmi jumpserver/jms_coco:1.5.0 # 自行替换版本
$ docker rmi jumpserver/jms_guacamole:1.4.10 # 自行替换版本 $ docker rmi jumpserver/jms_guacamole:1.5.0 # 自行替换版本
# 删除自启文件 # 删除自启文件
$ rm -rf /usr/lib/systemd/system/jms.service $ rm -rf /usr/lib/systemd/system/jms.service
......
docs/upgrade.rst
View file @ aa2574de
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment