Update

docs/1

+更新升级
+-------------
+
+1.0.0 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- 请先检查自己各组件的当前版本
+- 不支持从 0.x 版本升级到 1.x 版本
+- 本文档仅针对 1.0 及之后的版本升级教程
+- 从 1.4.x 版本开始 mysql 版本需要大于等于 5.6,mariadb 版本需要大于等于 5.5.6
+
+0. 检查数据库表结构文件是否完整
+
+.. code-block:: shell
+
+    # 为了保证能顺利升级,请先检查数据库表结构文件是否完整
+    $ cd /opt/jumpserver/apps
+    $ for d in $(ls); do if [ -d $d ] && [ -d $d/migrations ]; then ll ${d}/migrations/*.py | grep -v __init__.py; fi; done
+
+    # 新开一个终端,连接到 jumpserver 的数据库服务器
+    $ mysql -uroot -p
+    > use jumpserver;
+    > select app,name from django_migrations where app in('assets','audits','common','ops','orgs','perms','terminal','users') order by app asc;
+
+    # 如果左右对比信息不一致, 通过升级常见问题解决
+
+丢失表结构文件参考 `升级常见问题 <faq_upgrade.html>`_
+
+1. 备份 Jumpserver
+
+.. code-block:: shell
+
+    $ cp -r /opt/jumpserver /opt/jumpserver_bak
+    $ mysqldump -uroot -p jumpserver --ignore-table=jumpserver.django_migrations > /opt/jumpserver.sql
+
+2. 升级 Jumpserver
+
+.. code-block:: shell
+
+    $ cd /opt/jumpserver
+    $ source /opt/py3/bin/activate
+    $ ./jms stop
+    $ git pull
+    $ git checkout 1.4.4
+    $ mv config.py config_1.0.0.bak
+    $ cp config_example.py config.py
+    $ vi config.py  # 对照 config_1.0.0.bak 修改, 把原来的配置重新写进去
+
+.. code-block:: python
+
+    """
+        jumpserver.config
+        ~~~~~~~~~~~~~~~~~
+
+        Jumpserver project setting file
+
+        :copyright: (c) 2014-2017 by Jumpserver Team
+        :license: GPL v2, see LICENSE for more details.
+    """
+    import os
+
+    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+    class Config:
+        # Use it to encrypt or decrypt data
+
+        # Jumpserver 使用 SECRET_KEY 进行加密,请务必修改以下设置
+        # SECRET_KEY = '请随意输入随机字符串(推荐字符大于等于 50位)'
+        SECRET_KEY = os.environ.get('SECRET_KEY') or '2vym+ky!997d5kkcc64mnz06y1mmui3lut#(^wd=%s_qj$1%x'
+
+        # Django security setting, if your disable debug model, you should setting that
+        ALLOWED_HOSTS = ['*']
+
+        # DEBUG 模式 True为开启 False为关闭,默认开启,生产环境推荐关闭
+        # 注意：如果设置了DEBUG = False,访问8080端口页面会显示不正常,需要搭建 nginx 代理才可以正常访问
+        DEBUG = os.environ.get("DEBUG") or False
+
+        # 日志级别,默认为DEBUG,可调整为INFO, WARNING, ERROR, CRITICAL,默认INFO
+        LOG_LEVEL = os.environ.get("LOG_LEVEL") or 'WARNING'
+        LOG_DIR = os.path.join(BASE_DIR, 'logs')
+
+        # 使用的数据库配置,支持sqlite3, mysql, postgres等,默认使用sqlite3
+        # See https://docs.djangoproject.com/en/1.10/ref/settings/#databases
+
+        # 默认使用SQLite3,如果使用其他数据库请注释下面两行
+        # DB_ENGINE = 'sqlite3'
+        # DB_NAME = os.path.join(BASE_DIR, 'data', 'db.sqlite3')
+
+        # 如果需要使用mysql或postgres,请取消下面的注释并输入正确的信息,本例使用mysql做演示(mariadb也是mysql)
+        DB_ENGINE = os.environ.get("DB_ENGINE") or 'mysql'
+        DB_HOST = os.environ.get("DB_HOST") or '127.0.0.1'
+        DB_PORT = os.environ.get("DB_PORT") or 3306
+        DB_USER = os.environ.get("DB_USER") or 'jumpserver'
+        DB_PASSWORD = os.environ.get("DB_PASSWORD") or 'weakPassword'
+        DB_NAME = os.environ.get("DB_NAME") or 'jumpserver'
+
+        # Django 监听的ip和端口
+        # ./manage.py runserver 127.0.0.1:8080
+        HTTP_BIND_HOST = '0.0.0.0'
+        HTTP_LISTEN_PORT = 8080
+
+        # Redis 相关设置
+        REDIS_HOST = os.environ.get("REDIS_HOST") or '127.0.0.1'
+        REDIS_PORT = os.environ.get("REDIS_PORT") or 6379
+        REDIS_PASSWORD = os.environ.get("REDIS_PASSWORD") or ''
+        REDIS_DB_CELERY = os.environ.get('REDIS_DB') or 3
+        REDIS_DB_CACHE = os.environ.get('REDIS_DB') or 4
+
+        def __init__(self):
+            pass
+
+        def __getattr__(self, item):
+            return None
+
+
+    class DevelopmentConfig(Config):
+        pass
+
+
+    class TestConfig(Config):
+        pass
+
+
+    class ProductionConfig(Config):
+        pass
+
+
+    # Default using Config settings, you can write if/else for different env
+    config = DevelopmentConfig()
+
+
+
+1.1.0 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.1.1 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.2.0 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.2.1 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.3.0 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.3.1 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.3.2 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.3.3 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.4.0 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.4.1 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.4.2 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.4.3 升级到 1.4.4
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+1.4.4 升级到 1.4.5
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- 当前版本必须是 1.4.4 版本,否则请先升级到 1.4.4
+- 从 1.4.5 版本开始,由官方维护唯一 migrations
+
+**Jumpserver**
+
+.. code-block:: shell
+
+    $ cd /opt/jumpserver
+    $ source /opt/py3/bin/activate
+    $ ./jms stop
+
+.. code-block:: shell
+
+    # 备份 Jumpserver
+    $ cp -r /opt/jumpserver /opt/jumpserver_bak
+    $ cd /opt/jumpserver
+    $ sh utils/clean_migrations.sh
+
+.. code-block:: shell
+
+    $ cd /opt/jumpserver
+    $ git checkout master
+    $ git pull
+
+    # 更新 config.py ,请根据你原备份的 config.py 内容进行修改
+    $ mv config.py config_1.4.4.bak
+    $ cp config_example.py config.py
+    $ vi config.py
+
+.. code-block:: python
+
+    """
+        jumpserver.config
+        ~~~~~~~~~~~~~~~~~
+
+        Jumpserver project setting file
+
+        :copyright: (c) 2014-2017 by Jumpserver Team
+        :license: GPL v2, see LICENSE for more details.
+    """
+    import os
+
+    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+    class Config:
+        """
+        Jumpserver Config File
+        Jumpserver 配置文件
+
+        Jumpserver use this config for drive django framework running,
+        You can set is value or set the same envirment value,
+        Jumpserver look for config order: file => env => default
+
+        Jumpserver使用配置来驱动Django框架的运行，
+        你可以在该文件中设置，或者设置同样名称的环境变量,
+        Jumpserver使用配置的顺序: 文件 => 环境变量 => 默认值
+        """
+        # SECURITY WARNING: keep the secret key used in production secret!
+        # 加密秘钥 生产环境中请修改为随机字符串，请勿外泄
+        SECRET_KEY = '2vym+ky!997d5kkcc64mnz06y1mmui3lut#(^wd=%s_qj$1%x'
+
+        # SECURITY WARNING: keep the bootstrap token used in production secret!
+        # 预共享Token coco和guacamole用来注册服务账号，不在使用原来的注册接受机制
+        BOOTSTRAP_TOKEN = 'nwv4RdXpM82LtSvm'
+
+        # Development env open this, when error occur display the full process track, Production disable it
+        # DEBUG 模式 开启DEBUG后遇到错误时可以看到更多日志
+        # DEBUG = True
+        DEBUG = False
+
+        # DEBUG, INFO, WARNING, ERROR, CRITICAL can set. See https://docs.djangoproject.com/en/1.10/topics/logging/
+        # 日志级别
+        # LOG_LEVEL = 'DEBUG'
+        # LOG_DIR = os.path.join(BASE_DIR, 'logs')
+        LOG_LEVEL = 'ERROR'
+
+        # Session expiration setting, Default 24 hour, Also set expired on on browser close
+        # 浏览器Session过期时间，默认24小时, 也可以设置浏览器关闭则过期
+        # SESSION_COOKIE_AGE = 3600 * 24
+        # SESSION_EXPIRE_AT_BROWSER_CLOSE = False
+        SESSION_EXPIRE_AT_BROWSER_CLOSE = True
+
+        # Database setting, Support sqlite3, mysql, postgres ....
+        # 数据库设置
+        # See https://docs.djangoproject.com/en/1.10/ref/settings/#databases
+
+        # SQLite setting:
+        # 使用单文件sqlite数据库
+        # DB_ENGINE = 'sqlite3'
+        # DB_NAME = os.path.join(BASE_DIR, 'data', 'db.sqlite3')
+
+        # MySQL or postgres setting like:
+        # 使用Mysql作为数据库
+        DB_ENGINE = 'mysql'
+        DB_HOST = '127.0.0.1'
+        DB_PORT = 3306
+        DB_USER = 'jumpserver'
+        DB_PASSWORD = 'weakPassword'
+        DB_NAME = 'jumpserver'
+
+        # When Django start it will bind this host and port
+        # ./manage.py runserver 127.0.0.1:8080
+        # 运行时绑定端口
+        HTTP_BIND_HOST = '0.0.0.0'
+        HTTP_LISTEN_PORT = 8080
+
+        # Use Redis as broker for celery and web socket
+        # Redis配置
+        REDIS_HOST = '127.0.0.1'
+        REDIS_PORT = 6379
+        # REDIS_PASSWORD = ''
+        # REDIS_DB_CELERY_BROKER = 3
+        # REDIS_DB_CACHE = 4
+
+        # Use OpenID authorization
+        # 使用OpenID 来进行认证设置
+        # BASE_SITE_URL = 'http://localhost:8080'
+        # AUTH_OPENID = False  # True or False
+        # AUTH_OPENID_SERVER_URL = 'https://openid-auth-server.com/'
+        # AUTH_OPENID_REALM_NAME = 'realm-name'
+        # AUTH_OPENID_CLIENT_ID = 'client-id'
+        # AUTH_OPENID_CLIENT_SECRET = 'client-secret'
+
+        def __init__(self):
+            pass
+
+        def __getattr__(self, item):
+            return None
+
+
+    class DevelopmentConfig(Config):
+        pass
+
+
+    class TestConfig(Config):
+        pass
+
+
+    class ProductionConfig(Config):
+        pass
+
+
+    # Default using Config settings, you can write if/else for different env
+    config = DevelopmentConfig()
+
+.. code-block:: shell
+
+    $ pip install -r requirements/requirements.txt
+    $ cd utils
+    $ sh 1.4.4_to_1.4.5_migrations.sh
+    $ sh make_migrations.sh
+
+    $ cd ../
+    $ ./jms start all -d
+
+**Coco**
+
+说明: Docker 部署的请跳过
+
+.. code-block:: shell
+
+    $ cd /opt/coco
+    $ git pull
+    $ source /opt/py3/bin/activate
+    $ ./cocod stop
+
+    $ mv conf.py $jumpserver_backup/
+
+    # 更新 conf.py ,请根据你原备份的 conf.py 内容进行修改
+    $ cp conf_example.py conf.py
+    $ vi conf.py
+
+.. code-block:: python
+
+    #!/usr/bin/env python3
+    # -*- coding: utf-8 -*-
+    #
+
+    import os
+
+    BASE_DIR = os.path.dirname(__file__)
+
+
+    class Config:
+        """
+        Coco config file, coco also load config from server update setting below
+        """
+        # 项目名称, 会用来向Jumpserver注册, 识别而已, 不能重复
+        # NAME = "localhost"
+        NAME = "coco"
+
+        # Jumpserver项目的url, api请求注册会使用, 如果Jumpserver没有运行在127.0.0.1:8080,请修改此处
+        # CORE_HOST = os.environ.get("CORE_HOST") or 'http://127.0.0.1:8080'
+        CORE_HOST = 'http://127.0.0.1:8080'
+
+        # Bootstrap Token, 预共享秘钥, 用来注册coco使用的service account和terminal
+        # 请和jumpserver 配置文件中保持一致，注册完成后可以删除
+        # BOOTSTRAP_TOKEN = "PleaseChangeMe"
+        BOOTSTRAP_TOKEN = "nwv4RdXpM82LtSvmV"
+
+        # 启动时绑定的ip, 默认 0.0.0.0
+        # BIND_HOST = '0.0.0.0'
+
+        # 监听的SSH端口号, 默认2222
+        # SSHD_PORT = 2222
+
+        # 监听的HTTP/WS端口号,默认5000
+        # HTTPD_PORT = 5000
+
+        # 项目使用的ACCESS KEY, 默认会注册,并保存到 ACCESS_KEY_STORE中,
+        # 如果有需求, 可以写到配置文件中, 格式 access_key_id:access_key_secret
+        # ACCESS_KEY = None
+
+        # ACCESS KEY 保存的地址, 默认注册后会保存到该文件中
+        # ACCESS_KEY_STORE = os.path.join(BASE_DIR, 'keys', '.access_key')
+
+        # 加密密钥
+        # SECRET_KEY = None
+
+        # 设置日志级别 ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'CRITICAL']
+        # LOG_LEVEL = 'INFO'
+        LOG_LEVEL = 'ERROR'
+
+        # 日志存放的目录
+        # LOG_DIR = os.path.join(BASE_DIR, 'logs')
+
+        # Session录像存放目录
+        # SESSION_DIR = os.path.join(BASE_DIR, 'sessions')
+
+        # 资产显示排序方式, ['ip', 'hostname']
+        # ASSET_LIST_SORT_BY = 'ip'
+
+        # 登录是否支持密码认证
+        # PASSWORD_AUTH = True
+
+        # 登录是否支持秘钥认证
+        # PUBLIC_KEY_AUTH = True
+
+        # SSH白名单
+        # ALLOW_SSH_USER = 'all'  # ['test', 'test2']
+
+        # SSH黑名单, 如果用户同时在白名单和黑名单,黑名单优先生效
+        # BLOCK_SSH_USER = []
+
+        # 和Jumpserver 保持心跳时间间隔
+        # HEARTBEAT_INTERVAL = 5
+
+        # Admin的名字,出问题会提示给用户
+        # ADMINS = ''
+        COMMAND_STORAGE = {
+            "TYPE": "server"
+        }
+        REPLAY_STORAGE = {
+            "TYPE": "server"
+        }
+
+        # SSH连接超时时间 (default 15 seconds)
+        # SSH_TIMEOUT = 15
+
+        # 语言 = en
+        LANGUAGE_CODE = 'zh'
+
+
+    config = Config()
+
+.. code-block:: shell
+
+    $ pip install -r requirements/requirements.txt
+    $ ./cocod start -d
+
+**Guacamole**
+
+说明: Docker 部署的请跳过
+
+.. code-block:: shell
+
+    $ cd /opt/docker-guacamole
+    $ git pull
+    $ /etc/init.d/guacd stop
+    $ sh /config/tomcat8/bin/shutdown.sh
+    $ cp -r guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar
+
+    $ cd /config
+    $ wget https://github.com/ibuler/ssh-forward/releases/download/v0.0.5/linux-amd64.tar.gz
+    $ tar xf linux-amd64.tar.gz -C /bin/
+    $ chmod +x /bin/ssh-forward
+
+    $ export BOOTSTRAP_TOKEN=nwv4RdXpM82LtSvmV
+    $ echo "export BOOTSTRAP_TOKEN=nwv4RdXpM82LtSvmV" >> ~/.bashrc
+
+    $ /etc/init.d/guacd start
+    $ sh /config/tomcat8/bin/startup.sh
+
+**Luna**
+
+说明: 直接下载 release 包
+
+.. code-block:: shell
+
+    $ cd /opt
+    $ rm -rf luna
+    $ wget https://github.com/jumpserver/luna/releases/download/v1.4.5/luna.tar.gz
+    $ tar xf luna.tar.gz
+    $ chown -R root:root luna
+
+**Docker Coco Guacamole**
+
+说明: Docker 部署的 coco 与 guacamole 升级说明
+
+.. code-block:: shell
+
+    # 先到 Web 会话管理 - 终端管理 删掉所有组件
+    $ docker sop jms_coco
+    $ docker stop jms_guacamole
+    $ docker rm jms_coco
+    $ docker rm jms_guacamole
+    $ docker pull wojiushixiaobai/coco:1.4.5
+    $ docker pull wojiushixiaobai/guacamole:1.4.5
+    $ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=nwv4RdXpM82LtSvmV wojiushixiaobai/coco:1.4.5
+    $ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> -e BOOTSTRAP_TOKEN=nwv4RdXpM82LtSvmV wojiushixiaobai/guacamole:1.4.5
+
+    # 到 Web 会话管理 - 终端管理 查看组件是否已经在线
+
+
+1.4.6 及之后版本升级说明 (未开放, 等待更新)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- 如果当前版本必须小于 1.4.5 ,请先升级到 1.4.5

docs/distributed_05.rst

@@ -183,7 +183,7 @@
 
     # 生成数据库表结构和初始化数据
     $ cd /opt/jumpserver/utils
-    $ bash make_migrations.sh
+    $ sh make_migrations.sh
 
     # 运行 Jumpserver
     $ cd /opt/jumpserver

docs/faq_install.rst

@@ -29,13 +29,13 @@
     $ pip install -r requirement.txt -i https://pypi.org/simple
     $ pip install xxxxx==x.x.xx -i https://pypi.org/simple
 
-5. bash make_migrations.sh 时报错 from config import config as CONFIG File "/opt/jumpserver/config.py", line 38
+5. sh make_migrations.sh 时报错 from config import config as CONFIG File "/opt/jumpserver/config.py", line 38
 
 .. code-block:: vim
 
     # 这是由于 config.py 里面的内容格式不对,请参考安装文档的说明,把提示的内容与上一行对齐即可
 
-6. bash make_migrations.sh 时报错 Are you sure it's installed and available on your PYTHONPATH environment variable? Did you forget to activate a virtual environment?
+6. sh make_migrations.sh 时报错 Are you sure it's installed and available on your PYTHONPATH environment variable? Did you forget to activate a virtual environment?
 
 .. code-block:: shell
 
@@ -48,7 +48,7 @@
     # 如果已经在 py3 虚拟环境下,任然报 Are you sure it's installed and available on your PYTHONPATH environment variable? Did you forget to activate a virtual environment?
     $ cd /opt/jumpserver/requirements
     $ pip install -r requirements.txt
-    # 然后重新执行 bash make_migrations.sh
+    # 然后重新执行 sh make_migrations.sh
 
 7.  sh make_migrations.sh 报错 CommandError: Conflicting migrations detected; multiple ... django_celery_beat ...
 

docs/setup_by_centos7.rst

@@ -193,7 +193,7 @@ CentOS 7 安装文档
 
     # 生成数据库表结构和初始化数据
     $ cd /opt/jumpserver/utils
-    $ bash make_migrations.sh
+    $ sh make_migrations.sh
 
     # 运行 Jumpserver
     $ cd /opt/jumpserver

docs/setup_by_ubuntu.rst

@@ -219,7 +219,7 @@
 .. code-block:: shell
 
     $ cd /opt/jumpserver/utils
-    $ bash make_migrations.sh
+    $ sh make_migrations.sh
 
 **2.9 运行 Jumpserver**
 

docs/step_by_step.rst

@@ -261,7 +261,7 @@
 
     # 新版本更新了运行脚本,使用方式./jms start|stop|status|restart all  后台运行请添加 -d 参数
 
-运行不报错,请浏览器访问 http://192.168.244.144:8080/  默认账号: admin 密码: admin 页面显示不正常先不用处理,继续往下操作,后面搭建 nginx 代理后即可正常访问,原因是因为 django 无法在非 debug 模式下加载静态资源
+运行不报错, 请继续往下操作
 
 三. 安装 SSH Server 和 WebSocket Server: Coco
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -395,8 +395,6 @@
 
     # 新版本更新了运行脚本,使用方式./cocod start|stop|status|restart  后台运行请添加 -d 参数
 
-启动成功后去Jumpserver 会话管理-终端管理(http://192.168.244.144:8080/terminal/terminal/)接受coco的注册
-
 四. 安装 Web Terminal 前端: Luna
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -489,8 +487,6 @@ Guacamole 需要 Tomcat 来运行
     $ /etc/init.d/guacd start
     $ sh /config/tomcat8/bin/startup.sh
 
-启动成功后去Jumpserver 会话管理-终端管理(http://192.168.244.144:8080/terminal/terminal/)接受[Gua]开头的一个注册
-
 六. 配置 Nginx 整合各组件
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -498,48 +494,36 @@ Guacamole 需要 Tomcat 来运行
 
 .. code-block:: shell
 
-    $ yum -y install nginx
-
-.. code-block:: nginx
-
-    $ vi /etc/nginx/nginx.conf
-
-    ... 原内容
-    include /etc/nginx/conf.d/*.conf;
-
-    # 注释掉整个server {}
-    # server {
-        # listen       80 default_server;
-        # listen       [::]:80 default_server;
-        # server_name  _;
-        # root         /usr/share/nginx/html;
+    # CentOS7
+    $ vi /etc/yum.repos.d/nginx.repo
 
-        # Load configuration files for the default server block.
-        # include /etc/nginx/default.d/*.conf;
+    [nginx]
+    name=nginx repo
+    baseurl=http://nginx.org/packages/centos/7/$basearch/
+    gpgcheck=0
+    enabled=1
 
-        # location / {
-        # }
+    # CentOS6
+    $ vi /etc/yum.repos.d/nginx.repo
 
-        # error_page 404 /404.html;
-            # location = /40x.html {
-        # }
+    [nginx]
+    name=nginx repo
+    baseurl=http://nginx.org/packages/centos/6/$basearch/
+    gpgcheck=0
+    enabled=1
 
-        # error_page 500 502 503 504 /50x.html;
-            # location = /50x.html {
-        # }
-    # }
-    ... 原内容
+    $ yum -y install nginx
+    $ rm -rf /etc/nginx/conf.d/default.conf
 
 **6.2 准备配置文件 修改 /etc/nginx/conf.d/jumpserver.conf**
 
 .. code-block:: nginx
 
     $ vi /etc/nginx/conf.d/jumpserver.conf
-    # 注意注释 nginx.conf 里面的 server {} 内容 ,CentOS 6 需要修改文件 /etc/nginx/cond.f/default.conf
 
     server {
         listen 80;  # 代理端口,以后将通过此端口进行访问,不再通过8080端口
-        server_name demo.jumpserver.org;  # 修改成你的域名
+        # server_name demo.jumpserver.org;  # 修改成你的域名或者注释掉
 
         client_max_body_size 100m;  # 录像及文件上传大小限制
 
@@ -620,7 +604,7 @@ Guacamole 需要 Tomcat 来运行
 
 默认账号: admin 密码: admin
 
-如果部署过程中没有接受应用的注册,需要到Jumpserver 会话管理-终端管理 接受 Coco Guacamole 等应用的注册。
+到Jumpserver 会话管理-终端管理 接受 Coco Guacamole 等应用的注册。
 
 **测试连接**
 

docs/upgrade.rst

@@ -47,7 +47,6 @@
 
 .. code-block:: shell
 
-    # 升级前请做好 jumpserver 目录与 数据库 备份,谨防意外
     $ cd /opt/jumpserver
     $ source /opt/py3/bin/activate
     $ ./jms stop
@@ -56,14 +55,95 @@
 
 .. code-block:: shell
 
-    # jumpserver 版本小于 1.3 升级到最新版本请使用新的 config.py (升级前版本小于 1.3 需要执行此步骤,否则跳过)
-    $ mv config.py config.bak
+    $ mv config.py config_old.bak
     $ cp config_example.py config.py
-    $ vi config.py  # 参考安装文档进行修改
+    $ vi config.py
+
+.. code-block:: python
+
+    """
+        jumpserver.config
+        ~~~~~~~~~~~~~~~~~
+
+        Jumpserver project setting file
+
+        :copyright: (c) 2014-2017 by Jumpserver Team
+        :license: GPL v2, see LICENSE for more details.
+    """
+    import os
+
+    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+
+
+    class Config:
+        # Use it to encrypt or decrypt data
+
+        # Jumpserver 使用 SECRET_KEY 进行加密,请务必修改以下设置
+        # 保持与你原来的 SECRET_KEY 一致, 可查看 config_old.bak
+        SECRET_KEY = os.environ.get('SECRET_KEY') or '2vym+ky!997d5kkcc64mnz06y1mmui3lut#(^wd=%s_qj$1%x'
+
+        # Django security setting, if your disable debug model, you should setting that
+        ALLOWED_HOSTS = ['*']
+
+        # DEBUG 模式 True为开启 False为关闭,默认开启,生产环境推荐关闭
+        # 注意：如果设置了DEBUG = False,访问8080端口页面会显示不正常,需要搭建 nginx 代理才可以正常访问
+        DEBUG = os.environ.get("DEBUG") or False
+
+        # 日志级别,默认为DEBUG,可调整为INFO, WARNING, ERROR, CRITICAL,默认INFO
+        LOG_LEVEL = os.environ.get("LOG_LEVEL") or 'WARNING'
+        LOG_DIR = os.path.join(BASE_DIR, 'logs')
+
+        # 使用的数据库配置,支持sqlite3, mysql, postgres等,默认使用sqlite3
+        # See https://docs.djangoproject.com/en/1.10/ref/settings/#databases
+
+        # 默认使用SQLite3,如果使用其他数据库请注释下面两行
+        # DB_ENGINE = 'sqlite3'
+        # DB_NAME = os.path.join(BASE_DIR, 'data', 'db.sqlite3')
+
+        # 请手动修改下面数据库设置, 保持与你原来的设置一致, 可查看config_old.bak
+        DB_ENGINE = os.environ.get("DB_ENGINE") or 'mysql'
+        DB_HOST = os.environ.get("DB_HOST") or '127.0.0.1'
+        DB_PORT = os.environ.get("DB_PORT") or 3306
+        DB_USER = os.environ.get("DB_USER") or 'jumpserver'
+        DB_PASSWORD = os.environ.get("DB_PASSWORD") or 'weakPassword'
+        DB_NAME = os.environ.get("DB_NAME") or 'jumpserver'
+
+        # Django 监听的ip和端口
+        # ./manage.py runserver 127.0.0.1:8080
+        HTTP_BIND_HOST = '0.0.0.0'
+        HTTP_LISTEN_PORT = 8080
+
+        # 请手动修改下面 Redis 设置, 保持与你原来的设置一致, 可查看config_old.bak
+        REDIS_HOST = os.environ.get("REDIS_HOST") or '127.0.0.1'
+        REDIS_PORT = os.environ.get("REDIS_PORT") or 6379
+        REDIS_PASSWORD = os.environ.get("REDIS_PASSWORD") or ''
+        REDIS_DB_CELERY = os.environ.get('REDIS_DB') or 3
+        REDIS_DB_CACHE = os.environ.get('REDIS_DB') or 4
+
+        def __init__(self):
+            pass
+
+        def __getattr__(self, item):
+            return None
+
+
+    class DevelopmentConfig(Config):
+        pass
+
+
+    class TestConfig(Config):
+        pass
+
+
+    class ProductionConfig(Config):
+        pass
+
+
+    # Default using Config settings, you can write if/else for different env
+    config = DevelopmentConfig()
 
 .. code-block:: shell
 
-    # 所有版本都需要执行此步骤
     $ pip install -r requirements/requirements.txt
     $ cd utils && sh make_migrations.sh
 
@@ -81,34 +161,71 @@
 
     # 启动 jumpserver
     $ cd ../
-    $ ./jms start all
+    $ ./jms start all -d
 
 .. code-block:: nginx
 
     # 任意版本升级到 1.4.2 版本,需要修改 nginx 配置 (升级前版本小于 1.4.2 需要执行此步骤)
     $ vi /etc/nginx/conf.d/jumpserver.conf  # 部分用户的配置文件是/etc/nginx/nginx.conf
 
-    ...
+    server {
+        listen 80;
 
-    location /socket.io/ {
-        # 原来的内容,请参考安装文档 nginx 部分
-    }
+        client_max_body_size 100m;  # 录像及文件上传大小限制
 
-    # 加入下面内容
-    location /coco/ {
-        proxy_pass       http://localhost:5000/coco/;  # 如果coco安装在别的服务器,请填写它的ip
-        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 /luna/ {
+            try_files $uri / /index.html;
+            alias /opt/luna/;  # luna 路径,如果修改安装目录,此处需要修改
+        }
 
-    location /guacamole/ {
-        # 原来的内容,请参考安装文档 nginx 部分
-    }
+        location /media/ {
+            add_header Content-Encoding gzip;
+            root /opt/jumpserver/data/;  # 录像位置,如果修改安装目录,此处需要修改
+        }
 
-    ...
+        location /static/ {
+            root /opt/jumpserver/data/;  # 静态资源,如果修改安装目录,此处需要修改
+        }
+
+        location /socket.io/ {
+            proxy_pass       http://localhost:5000/socket.io/;
+            proxy_buffering off;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            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 /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/;
+            proxy_buffering off;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection $http_connection;
+            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 / {
+            proxy_pass http://localhost:8080;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
 
 .. code-block:: shell
 
@@ -131,9 +248,99 @@
     # coco 升级前版本小于 1.4.1 升级到最新版本请使用新的 conf.py (升级前版本小于 1.4.1 需要执行此步骤)
     $ mv conf.py coco.bak
     $ cp conf_example.py conf.py
-    $ vi conf.py  # 参考安装文档进行修改
+    $ vi conf.py
+
+.. code-block:: python
+
+    #!/usr/bin/env python3
+    # -*- coding: utf-8 -*-
+    #
+
+    import os
+
+    BASE_DIR = os.path.dirname(__file__)
+
+
+    class Config:
+        """
+        Coco config file, coco also load config from server update setting below
+        """
+        # 项目名称, 会用来向Jumpserver注册, 识别而已, 不能重复
+        # NAME = "localhost"
+        NAME = "coco"
+
+        # Jumpserver项目的url, api请求注册会使用, 如果Jumpserver没有运行在127.0.0.1:8080,请修改此处
+        # CORE_HOST = os.environ.get("CORE_HOST") or 'http://127.0.0.1:8080'
+        CORE_HOST = 'http://127.0.0.1:8080'
+
+        # 启动时绑定的ip, 默认 0.0.0.0
+        # BIND_HOST = '0.0.0.0'
+
+        # 监听的SSH端口号, 默认2222
+        # SSHD_PORT = 2222
+
+        # 监听的HTTP/WS端口号,默认5000
+        # HTTPD_PORT = 5000
+
+        # 项目使用的ACCESS KEY, 默认会注册,并保存到 ACCESS_KEY_STORE中,
+        # 如果有需求, 可以写到配置文件中, 格式 access_key_id:access_key_secret
+        # ACCESS_KEY = None
+
+        # ACCESS KEY 保存的地址, 默认注册后会保存到该文件中
+        # ACCESS_KEY_STORE = os.path.join(BASE_DIR, 'keys', '.access_key')
+
+        # 加密密钥
+        # SECRET_KEY = None
+
+        # 设置日志级别 ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL', 'CRITICAL']
+        # LOG_LEVEL = 'INFO'
+        LOG_LEVEL = 'WARN'
+
+        # 日志存放的目录
+        # LOG_DIR = os.path.join(BASE_DIR, 'logs')
+
+        # Session录像存放目录
+        # SESSION_DIR = os.path.join(BASE_DIR, 'sessions')
+
+        # 资产显示排序方式, ['ip', 'hostname']
+        # ASSET_LIST_SORT_BY = 'ip'
 
-    $ ./cocod start
+        # 登录是否支持密码认证
+        # PASSWORD_AUTH = True
+
+        # 登录是否支持秘钥认证
+        # PUBLIC_KEY_AUTH = True
+
+        # SSH白名单
+        # ALLOW_SSH_USER = 'all'  # ['test', 'test2']
+
+        # SSH黑名单, 如果用户同时在白名单和黑名单,黑名单优先生效
+        # BLOCK_SSH_USER = []
+
+        # 和Jumpserver 保持心跳时间间隔
+        # HEARTBEAT_INTERVAL = 5
+
+        # Admin的名字,出问题会提示给用户
+        # ADMINS = ''
+        COMMAND_STORAGE = {
+            "TYPE": "server"
+        }
+        REPLAY_STORAGE = {
+            "TYPE": "server"
+        }
+
+        # SSH连接超时时间 (default 15 seconds)
+        # SSH_TIMEOUT = 15
+
+        # 语言 = en
+        LANGUAGE_CODE = 'zh'
+
+
+    config = Config()
+
+.. code-block:: shell
+
+    $ ./cocod start -d
 
 4. 升级 guacamole (docker 部署的请忽略往下看)
 
@@ -201,7 +408,7 @@
 .. code-block:: shell
 
     # 备份 Jumpserver
-    $ cp -r /opt/jumpserver /opt/jumpserver_bak
+    $ cp -r /opt/jumpserver /opt/jumpserver_1.4.4_bak
     $ cd /opt/jumpserver
     $ sh utils/clean_migrations.sh