This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new 23a8be2 Upgrade 2.0.1 "upgrade" doc and rm duplicate config in
pseudo-cluster (#592)
23a8be2 is described below
commit 23a8be2a2969af64fa1c782ff6043443a0c1a170
Author: Jiajie Zhong <[email protected]>
AuthorDate: Fri Dec 17 14:03:08 2021 +0800
Upgrade 2.0.1 "upgrade" doc and rm duplicate config in pseudo-cluster (#592)
* Upgrade 2.0.1 "upgrade" doc and rm duplicate config in pseudo-cluster
* Remove unless hint
---
.../user_doc/guide/installation/pseudo-cluster.md | 8 --------
docs/en-us/2.0.1/user_doc/upgrade.md | 21 ++++++++++-----------
docs/zh-cn/2.0.1/user_doc/upgrade.md | 21 ++++++++++-----------
3 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/docs/en-us/2.0.1/user_doc/guide/installation/pseudo-cluster.md
b/docs/en-us/2.0.1/user_doc/guide/installation/pseudo-cluster.md
index 1ae5d26..e4a1ac4 100644
--- a/docs/en-us/2.0.1/user_doc/guide/installation/pseudo-cluster.md
+++ b/docs/en-us/2.0.1/user_doc/guide/installation/pseudo-cluster.md
@@ -135,14 +135,6 @@ javaHome="/your/java/home/here"
# ---------------------------------------------------------
# Database
# ---------------------------------------------------------
-# Database type, username, password, IP, port, metadata. For now dbtype
supports `mysql` and `postgresql`
-dbtype="mysql"
-dbhost="localhost:3306"
-# Have to modify if you are not using dolphinscheduler/dolphinscheduler as
your username and password
-username="dolphinscheduler"
-password="dolphinscheduler"
-dbname="dolphinscheduler"
-
# Database type, username, password, IP, port, metadata. For now dbtype
supports `mysql` and `postgresql`, `H2`
# Please make sure that the value of configuration is quoted in double
quotation marks, otherwise may not take effect
DATABASE_TYPE="mysql"
diff --git a/docs/en-us/2.0.1/user_doc/upgrade.md
b/docs/en-us/2.0.1/user_doc/upgrade.md
index 8c34f28..ea5c0e4 100644
--- a/docs/en-us/2.0.1/user_doc/upgrade.md
+++ b/docs/en-us/2.0.1/user_doc/upgrade.md
@@ -13,20 +13,19 @@
- The following upgrade operations need to be performed in the new version's
directory.
## 4. Database Upgrade
-- Modify the following properties in conf/datasource.properties.
+- Modify the following properties in `conf/config/install_config.conf`.
- If you use MySQL as the database to run DolphinScheduler, please comment out
PostgreSQL related configurations, and add mysql connector jar into lib dir,
here we download mysql-connector-java-8.0.16.jar, and then correctly config
database connect information. You can download mysql connector jar
[here](https://downloads.MySQL.com/archives/c-j/). Alternatively, if you use
Postgres as database, you just need to comment out Mysql related
configurations, and correctly config database conne [...]
- ```properties
- # postgre
- #spring.datasource.driver-class-name=org.postgresql.Driver
- #spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
- # mysql
- spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
spring.datasource.url=jdbc:mysql://xxx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
- spring.datasource.username=xxx
- spring.datasource.password=xxx
- ```
+```conf
+# Database type, username, password, IP, port, metadata. For now dbtype
supports `mysql` and `postgresql`, `H2`
+# Please make sure that the value of configuration is quoted in double
quotation marks, otherwise may not take effect
+DATABASE_TYPE="mysql"
+SPRING_DATASOURCE_URL="jdbc:mysql://ds1:3306/ds_201_doc?useUnicode=true&characterEncoding=UTF-8"
+# Have to modify if you are not using dolphinscheduler/dolphinscheduler as
your username and password
+SPRING_DATASOURCE_USERNAME="dolphinscheduler"
+SPRING_DATASOURCE_PASSWORD="dolphinscheduler"
+```
- Execute database upgrade script
diff --git a/docs/zh-cn/2.0.1/user_doc/upgrade.md
b/docs/zh-cn/2.0.1/user_doc/upgrade.md
index 378a925..74a43d1 100644
--- a/docs/zh-cn/2.0.1/user_doc/upgrade.md
+++ b/docs/zh-cn/2.0.1/user_doc/upgrade.md
@@ -16,20 +16,19 @@
- **请先备份现有数据库**
-- 修改conf/datasource.properties中的下列属性
+- 修改 `conf/config/install_config.conf` 中的下列属性
- 如果选择 MySQL，请注释掉 PostgreSQL 相关配置(反之同理), 还需要手动添加 [[ mysql-connector-java 驱动
jar ](https://downloads.MySQL.com/archives/c-j/)] 包到 lib
目录下，这里下载的是mysql-connector-java-8.0.16.jar，然后正确配置数据库连接相关信息
- ```properties
- # postgre
- #spring.datasource.driver-class-name=org.postgresql.Driver
- #spring.datasource.url=jdbc:postgresql://localhost:5432/dolphinscheduler
- # mysql
- spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
spring.datasource.url=jdbc:mysql://xxx:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
需要修改ip，本机localhost即可
- spring.datasource.username=xxx
需要修改为上面的{user}值
- spring.datasource.password=xxx
需要修改为上面的{password}值
- ```
+```conf
+# 数据库的类型，用户名，密码，IP，端口，元数据库db。其中 DATABASE_TYPE 目前支持 mysql, postgresql, H2
+# 请确保配置的值使用双引号引用，否则配置可能不生效
+DATABASE_TYPE="mysql"
+SPRING_DATASOURCE_URL="jdbc:mysql://ds1:3306/ds_201_doc?useUnicode=true&characterEncoding=UTF-8"
+# 如果你不是以 dolphinscheduler/dolphinscheduler 作为用户名和密码的，需要进行修改
+SPRING_DATASOURCE_USERNAME="dolphinscheduler"
+SPRING_DATASOURCE_PASSWORD="dolphinscheduler"
+```
- 执行数据库升级脚本
