From 7c07900ea6c118f5f4bd61b826ef090198d69cf0 Mon Sep 17 00:00:00 2001
From: zhuangchong <37063904+zhuangchong@users.noreply.github.com>
Date: Sat, 6 Feb 2021 22:12:35 +0800
Subject: [PATCH] [Improvement][install] alert-server properties make
 adjustments in the Install script (#4709)

* imp alert-server alert.properties install config.

* add alert plugin dir param in the install_config.conf
---
 .../src/main/resources/alert.properties       |  2 +-
 .../main/resources/config/install_config.conf | 31 ++-----------------
 install.sh                                    | 10 ++----
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/dolphinscheduler-alert/src/main/resources/alert.properties b/dolphinscheduler-alert/src/main/resources/alert.properties
index 1e26d27fec..80ea87c2cd 100644
--- a/dolphinscheduler-alert/src/main/resources/alert.properties
+++ b/dolphinscheduler-alert/src/main/resources/alert.properties
@@ -21,7 +21,7 @@
 #eg : Alert Server Listener port
 
 #alert.plugin.dir config the Alert Plugin dir . AlertServer while find and load the Alert Plugin Jar from this dir when deploy and start AlertServer on the server .
-#eg :alert.plugin.dir=/opt/soft/spi/lib/plugin/alert
+alert.plugin.dir=./lib/plugin/alert
 
 #maven.local.repository=/Users/gaojun/Documents/jianguoyun/localRepository
 
diff --git a/dolphinscheduler-server/src/main/resources/config/install_config.conf b/dolphinscheduler-server/src/main/resources/config/install_config.conf
index a20fa66087..f3ed554a88 100755
--- a/dolphinscheduler-server/src/main/resources/config/install_config.conf
+++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf
@@ -48,35 +48,10 @@ installPath="/data1_1T/dolphinscheduler"
 # Note: the deployment user needs to have sudo privileges and permissions to operate hdfs. If hdfs is enabled, the root directory needs to be created by itself
 deployUser="dolphinscheduler"
 
-
 # alert config
-# mail server host
-mailServerHost="smtp.exmail.qq.com"
-
-# mail server port
-# note: Different protocols and encryption methods correspond to different ports, when SSL/TLS is enabled, make sure the port is correct.
-mailServerPort="25"
-
-# sender
-mailSender="xxxxxxxxxx"
-
-# user
-mailUser="xxxxxxxxxx"
-
-# sender password
-# note: The mail.passwd is email service authorization code, not the email login password.
-mailPassword="xxxxxxxxxx"
-
-# TLS mail protocol support
-starttlsEnable="true"
-
-# SSL mail protocol support
-# only one of TLS and SSL can be in the true state.
-sslEnable="false"
-
-#note: sslTrust is the same as mailServerHost
-sslTrust="smtp.exmail.qq.com"
-
+# alert plugin dir
+# Note: find and load the Alert Plugin Jar from this dir.
+alertPluginDir="/data1_1T/dolphinscheduler/lib/plugin/alert"
 
 # resource storage type：HDFS,S3,NONE
 resourceStorageType="NONE"
diff --git a/install.sh b/install.sh
index 723ee908e8..9de49748c2 100755
--- a/install.sh
+++ b/install.sh
@@ -55,14 +55,8 @@ sed -i ${txt} "s#login.user.keytab.path.*#login.user.keytab.path=${keytabPath}#g
 sed -i ${txt} "s#zookeeper.quorum.*#zookeeper.quorum=${zkQuorum}#g" conf/zookeeper.properties
 sed -i ${txt} "s#\#zookeeper.dolphinscheduler.root.*#zookeeper.dolphinscheduler.root=${zkRoot}#g" conf/zookeeper.properties
 sed -i ${txt} "s#server.port.*#server.port=${apiServerPort}#g" conf/application-api.properties
-sed -i ${txt} "s#mail.server.host.*#mail.server.host=${mailServerHost}#g" conf/alert.properties
-sed -i ${txt} "s#mail.server.port.*#mail.server.port=${mailServerPort}#g" conf/alert.properties
-sed -i ${txt} "s#mail.sender.*#mail.sender=${mailSender}#g" conf/alert.properties
-sed -i ${txt} "s#mail.user.*#mail.user=${mailUser}#g" conf/alert.properties
-sed -i ${txt} "s#mail.passwd.*#mail.passwd=${mailPassword}#g" conf/alert.properties
-sed -i ${txt} "s#mail.smtp.starttls.enable.*#mail.smtp.starttls.enable=${starttlsEnable}#g" conf/alert.properties
-sed -i ${txt} "s#mail.smtp.ssl.trust.*#mail.smtp.ssl.trust=${sslTrust}#g" conf/alert.properties
-sed -i ${txt} "s#mail.smtp.ssl.enable.*#mail.smtp.ssl.enable=${sslEnable}#g" conf/alert.properties
+
+sed -i ${txt} "s#alert.plugin.dir.*#alert.plugin.dir=${alertPluginDir}#g" conf/alert.properties
 
 sed -i ${txt} "s#alert.listen.host.*#alert.listen.host=${alertServer}#g" conf/worker.properties