This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 7010bb2 Modify HDFS/S3 path (#2736)
7010bb2 is described below
commit 7010bb2ef22e1b66669bfeb33dc5eed943ce6c19
Author: xingchun-chen <[email protected]>
AuthorDate: Mon May 18 15:35:11 2020 +0800
Modify HDFS/S3 path (#2736)
* Modify HDFS/S3 path
* Modify HDFS/S3 path
* Update common.properties
Co-authored-by: chenxingchun <[email protected]>
Co-authored-by: dailidong <[email protected]>
---
.../src/main/resources/common.properties | 22 +++++++++++-----------
.../src/main/resources/config/install_config.conf | 10 +++++-----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dolphinscheduler-common/src/main/resources/common.properties
b/dolphinscheduler-common/src/main/resources/common.properties
index 3852c31..24d9406 100644
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@ -19,22 +19,22 @@
resource.storage.type=NONE
# resource store on HDFS/S3 path, resource file will store to this hadoop hdfs
path, self configuration, please make sure the directory exists on hdfs and
have read write permissions。"/dolphinscheduler" is recommended
-#resource.upload.path=/dolphinscheduler
+resource.upload.path=/dolphinscheduler
# user data local directory path, please make sure the directory exists and
have read write permissions
#data.basedir.path=/tmp/dolphinscheduler
# whether kerberos starts
-#hadoop.security.authentication.startup.state=false
+hadoop.security.authentication.startup.state=false
# java.security.krb5.conf path
-#java.security.krb5.conf.path=/opt/krb5.conf
+java.security.krb5.conf.path=/opt/krb5.conf
# login user from keytab username
-#[email protected]
[email protected]
# loginUserFromKeytab path
-#login.user.keytab.path=/opt/hdfs.headless.keytab
+login.user.keytab.path=/opt/hdfs.headless.keytab
#resource.view.suffixs
#resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties
@@ -46,21 +46,21 @@ hdfs.root.user=hdfs
fs.defaultFS=hdfs://mycluster:8020
# if resource.storage.type=S3，s3 endpoint
-#fs.s3a.endpoint=http://192.168.199.91:9010
+fs.s3a.endpoint=http://192.168.199.91:9010
# if resource.storage.type=S3，s3 access key
-#fs.s3a.access.key=A3DXS30FO22544RE
+fs.s3a.access.key=A3DXS30FO22544RE
# if resource.storage.type=S3，s3 secret key
-#fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
+fs.s3a.secret.key=OloCLq3n+8+sdPHUhJ21XrSxTC+JK
# if not use hadoop resourcemanager, please keep default value; if
resourcemanager HA enable, please type the HA ips ; if resourcemanager is
single, make this value empty
yarn.resourcemanager.ha.rm.ids=192.168.xx.xx,192.168.xx.xx
-# If resourcemanager HA enable or not use resourcemanager, please keep the
default value; If resourcemanager is single, you only need to replace ark1 to
actual resourcemanager hostname.
-yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
+# if resourcemanager HA enable or not use resourcemanager, please keep the
default value; If resourcemanager is single, you only need to replace ds1 to
actual resourcemanager hostname.
+yarn.application.status.address=http://ds1:8088/ws/v1/cluster/apps/%s
# system env path
#dolphinscheduler.env.path=env/dolphinscheduler_env.sh
development.state=false
-kerberos.expire.time=7
\ No newline at end of file
+kerberos.expire.time=7
diff --git
a/dolphinscheduler-server/src/main/resources/config/install_config.conf
b/dolphinscheduler-server/src/main/resources/config/install_config.conf
index 6e24bd9..206ea4d 100644
--- a/dolphinscheduler-server/src/main/resources/config/install_config.conf
+++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf
@@ -64,15 +64,15 @@ mailUser="xxxxxxxxxx"
mailPassword="xxxxxxxxxx"
# TLS mail protocol support
-starttlsEnable="false"
-
-#note: sslTrust is the same as mailServerHost
-sslTrust="smtp.exmail.qq.com"
+starttlsEnable="true"
# SSL mail protocol support
# note: The SSL protocol is enabled by default.
# only one of TLS and SSL can be in the true state.
-sslEnable="true"
+sslEnable="false"
+
+#note: sslTrust is the same as mailServerHost
+sslTrust="smtp.exmail.qq.com"
# resource storage type：HDFS,S3,NONE
