You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/04/28 09:57:41 UTC
[incubator-dolphinscheduler] branch dev updated: Increase dataX
environment variable, sslTrust default value (#2555)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 7a10008 Increase dataX environment variable, sslTrust default value (#2555)
7a10008 is described below
commit 7a100086b7cf0d86456446150811989ce54939b1
Author: xingchun-chen <55...@users.noreply.github.com>
AuthorDate: Tue Apr 28 17:57:30 2020 +0800
Increase dataX environment variable, sslTrust default value (#2555)
* add LoginTest license
* Delete useless packages
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group
* Increase dataX environment variable, sslTrust default value
Co-authored-by: chenxingchun <43...@qq.com>
---
dolphinscheduler-server/src/main/resources/config/install_config.conf | 3 ++-
script/env/dolphinscheduler_env.sh | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-server/src/main/resources/config/install_config.conf b/dolphinscheduler-server/src/main/resources/config/install_config.conf
index 4671be7..cba117e 100644
--- a/dolphinscheduler-server/src/main/resources/config/install_config.conf
+++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf
@@ -63,7 +63,8 @@ mailPassword="xxxxxxxxxx"
# TLS mail protocol support
starttlsEnable="false"
-sslTrust="xxxxxxxxxx"
+#note: sslTrust is the same as mailServerHost
+sslTrust="smtp.exmail.qq.com"
# SSL mail protocol support
# note: The SSL protocol is enabled by default.
diff --git a/script/env/dolphinscheduler_env.sh b/script/env/dolphinscheduler_env.sh
index e5b99e2..066f379 100644
--- a/script/env/dolphinscheduler_env.sh
+++ b/script/env/dolphinscheduler_env.sh
@@ -23,4 +23,6 @@ export PYTHON_HOME=/opt/soft/python
export JAVA_HOME=/opt/soft/java
export HIVE_HOME=/opt/soft/hive
export FLINK_HOME=/opt/soft/flink
-export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$PATH
+export DATAX_HOME=/opt/soft/dataX
+
+export PATH=$HADOOP_HOME/bin:$SPARK_HOME1/bin:$SPARK_HOME2/bin:$PYTHON_HOME:$JAVA_HOME/bin:$HIVE_HOME/bin:$PATH:$FLINK_HOME/bin:$DATAX_HOME/bin:$PATH