From ad27cee1af7893ee1a2c8c3f90a84af1a5011ed2 Mon Sep 17 00:00:00 2001 From: wl4g <983708408@qq.com> Date: Mon, 21 Feb 2022 14:58:04 +0800 Subject: [PATCH] fix: deploy scripts --- script/deploy/deploy-base.sh | 72 +++++++++++++++++----------------- script/deploy/deploy-boot.sh | 10 ++--- script/deploy/deploy-common.sh | 8 ++-- script/deploy/deploy-host.sh | 30 +++++++------- script/deploy/dopaas-ctl.sh | 6 +-- script/deploy/undeploy-host.sh | 8 ++-- 6 files changed, 67 insertions(+), 67 deletions(-) diff --git a/script/deploy/deploy-base.sh b/script/deploy/deploy-base.sh index 8d8fa9987c..a7524f705a 100644 --- a/script/deploy/deploy-base.sh +++ b/script/deploy/deploy-base.sh @@ -73,15 +73,15 @@ currDate=$(date -d today +"%Y-%m-%d_%H%M%S") [ -z "$localGitDownloadUrlForUbuntu20x64" ] && export localGitDownloadUrlForUbuntu20x64="file://${pkgRepoLocalDir}/git-2.27.0-ubuntu20-x64-bin.tar.gz" # Clone URLs. [ -z "$gitBaseUri" ] && export gitBaseUri=$([ "$isChinaLANNetwork" == "Y" ] && echo "https://gitee.com/wl4g" || echo "https://github.com/wl4g") # For speed-up, fuck! -[ -z "$gitXCloudComponentUrl" ] && export gitXCloudComponentUrl="${gitBaseUri}/xcloud-component" -[ -z "$gitXCloudIamUrl" ] && export gitXCloudIamUrl="${gitBaseUri}/xcloud-iam" -[ -z "$gitXCloudDoPaaSUrl" ] && export gitXCloudDoPaaSUrl="${gitBaseUri}/xcloud-dopaas" -[ -z "$gitXCloudDoPaaSViewUrl" ] && export gitXCloudDoPaaSViewUrl="${gitBaseUri}/xcloud-dopaas-view" +[ -z "$gitDoPaaSInfraUrl" ] && export gitDoPaaSInfraUrl="${gitBaseUri}/dopaas-infra" +[ -z "$gitDoPaaSIamUrl" ] && export gitDoPaaSIamUrl="${gitBaseUri}/dopaas-iam" +[ -z "$gitDoPaaSUrl" ] && export gitDoPaaSUrl="${gitBaseUri}/dopaas" +[ -z "$gitDoPaaSViewUrl" ] && export gitDoPaaSViewUrl="${gitBaseUri}/dopaas-view" # Git project name of URLs. -[ -z "$gitXCloudComponentProjectName" ] && export gitXCloudComponentProjectName="$(echo `basename $gitXCloudComponentUrl`|sed s/.git//g)" -[ -z "$gitXCloudIamProjectName" ] && export gitXCloudIamProjectName="$(echo `basename $gitXCloudIamUrl`|sed s/.git//g)" -[ -z "$gitXCloudDoPaaSProjectName" ] && export gitXCloudDoPaaSProjectName="$(echo `basename $gitXCloudDoPaaSUrl`|sed s/.git//g)" -[ -z "$gitXCloudDoPaaSViewProjectName" ] && export gitXCloudDoPaaSViewProjectName="$(echo `basename $gitXCloudDoPaaSViewUrl`|sed s/.git//g)" +[ -z "$gitDoPaaSInfraProjectName" ] && export gitDoPaaSInfraProjectName="$(echo `basename $gitDoPaaSInfraUrl`|sed s/.git//g)" +[ -z "$gitDoPaaSIamProjectName" ] && export gitDoPaaSIamProjectName="$(echo `basename $gitDoPaaSIamUrl`|sed s/.git//g)" +[ -z "$gitDoPaaSProjectName" ] && export gitDoPaaSProjectName="$(echo `basename $gitDoPaaSUrl`|sed s/.git//g)" +[ -z "$gitDoPaaSViewProjectName" ] && export gitDoPaaSViewProjectName="$(echo `basename $gitDoPaaSViewUrl`|sed s/.git//g)" # pull branchs. [ -z "$gitDefaultBranch" ] && export gitDefaultBranch="master" [ -z "$gitComponentBranch" ] && export gitComponentBranch="${gitDefaultBranch}" @@ -110,7 +110,7 @@ currDate=$(date -d today +"%Y-%m-%d_%H%M%S") [ -z "$deployBackendSkip" ] && export deployBackendSkip="false" # Deploy(eureka). -export deployEurekaBuildModule="eureka-server,8761,internal,${currDir}/xcloud-component/xcloud-component-integration/xcloud-component-integration-eureka/target" +export deployEurekaBuildModule="eureka-server,8761,internal,${currDir}/dopaas-infra/dopaas-infra-integration/dopaas-infra-integration-eureka/target" # Deploy(zookeeper).(https://www.apache.org/dyn/closer.lua/zookeeper/zookeeper-3.6.3/apache-zookeeper-3.6.3-bin.tar.gz) [ -z "$zkHome" ] && export zkHome="$deployAppBaseDir/zookeeper-current/" @@ -134,39 +134,39 @@ export deployEurekaBuildModule="eureka-server,8761,internal,${currDir}/xcloud-co # Delopy(standalone mode). export deployStandaloneBuildModules=( - "standalone-iam,18080,external,${currDir}/xcloud-iam/xcloud-iam-service-starter-all/target" - "standalone-dopaas,20000,external,${currDir}/xcloud-dopaas/xcloud-dopaas-all-starter/target" + "standalone-iam,18080,external,${currDir}/dopaas-iam/dopaas-iam-service-starter-all/target" + "standalone-dopaas,20000,external,${currDir}/dopaas/dopaas-all-starter/target" ) # Deploy(cluster mode). export deployClusterNodesConfigPath="$currDir/deploy-host.csv" # Format: {appName},{appPort},{appType},{buildAssetsDir} export deployClusterBuildModules=( - "iam-data,18082,internal,${currDir}/xcloud-iam/service-starter-data/target" - "iam-facade,18081,internal,${currDir}/xcloud-iam/service-starter-facade/target" - "iam-web,18080,external,${currDir}/xcloud-iam/service-starter-web/target" - "home-facade,17001,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-home/xcloud-dopaas-home-service-starter-facade/target" - "home-manager,17000,external,${currDir}/xcloud-dopaas/xcloud-dopaas-home/xcloud-dopaas-home-service-starter-manager/target" - "cmdb-facade,17011,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-cmdb/xcloud-dopaas-cmdb-service-starter-facade/target" - "cmdb-manager,17010,external,${currDir}/xcloud-dopaas/xcloud-dopaas-cmdb/xcloud-dopaas-cmdb-service-starter-manager/target" - "uci-facade,17021,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-uci/xcloud-dopaas-uci-service-starter-facade/target" - "uci-server,17020,external,${currDir}/xcloud-dopaas/xcloud-dopaas-uci/xcloud-dopaas-uci-service-starter-server/target" - #"ucm-facade,17031,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-ucm/xcloud-dopaas-ucm-service-starter-facade/target" - #"ucm-server,17030,external,${currDir}/xcloud-dopaas/xcloud-dopaas-ucm/xcloud-dopaas-ucm-service-starter-server/target" - "lcdp-facade,17041,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-lcdp/xcloud-dopaas-lcdp-service-starter-facade/target" - "lcdp-manager,17040,external,${currDir}/xcloud-dopaas/xcloud-dopaas-lcdp/xcloud-dopaas-lcdp-service-starter-manager/target" - "udm-facade,17051,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-udm/xcloud-dopaas-udm-service-starter-facade/target" - "udm-manager,17050,external,${currDir}/xcloud-dopaas/xcloud-dopaas-udm/xcloud-dopaas-udm-service-starter-manager/target" - "umc-collector,17063,external,${currDir}/xcloud-dopaas/xcloud-dopaas-umc/xcloud-dopaas-umc-service-starter-collector/target" - "umc-tracker,17062,external,${currDir}/xcloud-dopaas/xcloud-dopaas-umc/xcloud-dopaas-umc-service-starter-tracker/target" - "umc-facade,17061,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-umc/xcloud-dopaas-umc-service-starter-facade/target" - "umc-manager,17060,external,${currDir}/xcloud-dopaas/xcloud-dopaas-umc/xcloud-dopaas-umc-service-starter-manager/target" - "urm-facade,17071,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-urm/xcloud-dopaas-urm-service-starter-facade/target" - "urm-manager,17070,external,${currDir}/xcloud-dopaas/xcloud-dopaas-urm/xcloud-dopaas-urm-service-starter-manager/target" - "uds-facade,17081,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-uds/xcloud-dopaas-uds-service-starter-facade/target" - "uds-manager,17080,external,${currDir}/xcloud-dopaas/xcloud-dopaas-uds/xcloud-dopaas-uds-service-starter-manager/target" - #"uos-facade,17091,internal,${currDir}/xcloud-dopaas/xcloud-dopaas-uos/xcloud-dopaas-uos-service-starter-facade/target" - #"uos-manager,17090,external,${currDir}/xcloud-dopaas/xcloud-dopaas-uos/xcloud-dopaas-uos-service-starter-manager/target" + "iam-data,18082,internal,${currDir}/dopaas-iam/service-starter-data/target" + "iam-facade,18081,internal,${currDir}/dopaas-iam/service-starter-facade/target" + "iam-web,18080,external,${currDir}/dopaas-iam/service-starter-web/target" + "home-facade,17001,internal,${currDir}/dopaas/dopaas-home/dopaas-home-service-starter-facade/target" + "home-manager,17000,external,${currDir}/dopaas/dopaas-home/dopaas-home-service-starter-manager/target" + "cmdb-facade,17011,internal,${currDir}/dopaas/dopaas-cmdb/dopaas-cmdb-service-starter-facade/target" + "cmdb-manager,17010,external,${currDir}/dopaas/dopaas-cmdb/dopaas-cmdb-service-starter-manager/target" + "uci-facade,17021,internal,${currDir}/dopaas/dopaas-uci/dopaas-uci-service-starter-facade/target" + "uci-server,17020,external,${currDir}/dopaas/dopaas-uci/dopaas-uci-service-starter-server/target" + #"ucm-facade,17031,internal,${currDir}/dopaas/dopaas-ucm/dopaas-ucm-service-starter-facade/target" + #"ucm-server,17030,external,${currDir}/dopaas/dopaas-ucm/dopaas-ucm-service-starter-server/target" + "lcdp-facade,17041,internal,${currDir}/dopaas/dopaas-lcdp/dopaas-lcdp-service-starter-facade/target" + "lcdp-manager,17040,external,${currDir}/dopaas/dopaas-lcdp/dopaas-lcdp-service-starter-manager/target" + "udm-facade,17051,internal,${currDir}/dopaas/dopaas-udm/dopaas-udm-service-starter-facade/target" + "udm-manager,17050,external,${currDir}/dopaas/dopaas-udm/dopaas-udm-service-starter-manager/target" + "umc-collector,17063,external,${currDir}/dopaas/dopaas-umc/dopaas-umc-service-starter-collector/target" + "umc-tracker,17062,external,${currDir}/dopaas/dopaas-umc/dopaas-umc-service-starter-tracker/target" + "umc-facade,17061,internal,${currDir}/dopaas/dopaas-umc/dopaas-umc-service-starter-facade/target" + "umc-manager,17060,external,${currDir}/dopaas/dopaas-umc/dopaas-umc-service-starter-manager/target" + "urm-facade,17071,internal,${currDir}/dopaas/dopaas-urm/dopaas-urm-service-starter-facade/target" + "urm-manager,17070,external,${currDir}/dopaas/dopaas-urm/dopaas-urm-service-starter-manager/target" + "uds-facade,17081,internal,${currDir}/dopaas/dopaas-uds/dopaas-uds-service-starter-facade/target" + "uds-manager,17080,external,${currDir}/dopaas/dopaas-uds/dopaas-uds-service-starter-manager/target" + #"uos-facade,17091,internal,${currDir}/dopaas/dopaas-uos/dopaas-uos-service-starter-facade/target" + #"uos-manager,17090,external,${currDir}/dopaas/dopaas-uos/dopaas-uos-service-starter-manager/target" ) # ----------------------- Frontend environment definition. ---------------------------------------- diff --git a/script/deploy/deploy-boot.sh b/script/deploy/deploy-boot.sh index d24c063be4..01effcd75d 100644 --- a/script/deploy/deploy-boot.sh +++ b/script/deploy/deploy-boot.sh @@ -26,8 +26,8 @@ export currDir=$(cd "`dirname $0`"/ ; pwd) # Basic deploy environment variables. [ -z "$workspaceDir" ] && export workspaceDir="${HOME}/.deploy-workspace" && mkdir -p $workspaceDir [ -z "$deployDebug" ] && export deployDebug="false" -[ -z "$scriptsBaseUrl" ] && export scriptsBaseUrl="https://raw.githubusercontent.com/wl4g/xcloud-dopaas/master/script/deploy" -[ -z "$scriptsBaseUrlBackup1" ] && export scriptsBaseUrlBackup1="https://gitee.com/wl4g/xcloud-dopaas/raw/master/script/deploy" +[ -z "$scriptsBaseUrl" ] && export scriptsBaseUrl="https://raw.githubusercontent.com/wl4g/dopaas/master/script/deploy" +[ -z "$scriptsBaseUrlBackup1" ] && export scriptsBaseUrlBackup1="https://gitee.com/wl4g/dopaas/raw/master/script/deploy" # Detecting network environment. function detectingNetwork() { @@ -262,14 +262,14 @@ function execWithConfirmingEnvironment() { function main() { [ -n "$(command -v clear)" ] && clear # e.g centos8+ not clear echo -e "" - echo -e "「 Welcome to XCloud DoPaaS Deployer (Boot) 」" + echo -e "「 Welcome to DoPaaS Deployer (Boot) 」" echo -e " \033[32m ___ ___ ___\033[0m" echo -e " \033[32m| . \ ___ | . \ ___ ___ / __>\033[0m" echo -e " \033[32m| | |/ . \| _/<_> |<_> |\__ \\\\\033[0m" echo -e " \033[32m|___/\___/|_| <___|<___|<___/\033[0m" echo -e "" - echo -e " Wiki: https://github.com/wl4g/xcloud-dopaas/blob/master/README.md" - echo -e " Wiki(CN): https://gitee.com/wl4g/xcloud-dopaas/blob/master/README_CN.md" + echo -e " Wiki: https://github.com/wl4g/dopaas/blob/master/README.md" + echo -e " Wiki(CN): https://gitee.com/wl4g/dopaas/blob/master/README_CN.md" echo -e " Authors: " echo -e " Version: 2.0.0" echo -e " Time: $(date '+%Y-%m-%d %H:%M:%S')" diff --git a/script/deploy/deploy-common.sh b/script/deploy/deploy-common.sh index 8de101e503..910874b3f4 100644 --- a/script/deploy/deploy-common.sh +++ b/script/deploy/deploy-common.sh @@ -445,7 +445,7 @@ function checkInstallServiceScript() { elif [ "$buildPkgType" == "springExecJar" ]; then local appRunCmd="$javaExec -server $jvmDebugOpts $jvmHeapOpts $jvmPerformanceOpts $jvmGcLogOpts $jvmJmxOpts $jvmJavaOpts -jar ${appHome}/${appName}-${appVersion}-bin.jar $appOpts" # for example using: java -cp myapp.jar -Dloader.main=com.MyApp org.springframework.boot.loader.PropertiesLauncher - # for example: xcloud-dopaas/xcloud-dopaas-ci/xcloud-dopaas-ci-service-starter-facade/pom.xml#profile.id=springExecJar + # for example: dopaas/dopaas-ci/dopaas-ci-service-starter-facade/pom.xml#profile.id=springExecJar # refer to: https://www.baeldung.com/spring-boot-main-class, https://www.jianshu.com/p/66a101c85485 local appShellRunCmd="$javaExec -client -Dloader.main=com.wl4g.ShellBootstrap -Dprompt=$appName -Dservname=$appName $shellPort -jar .:$appHome/${appName}-${appVersion}-bin.jar" else @@ -722,7 +722,7 @@ function downloadFile() { # Gets frontend project build version. function getFrontendBuildVersion() { - local fProjectDir="$currDir/$gitXCloudDoPaaSViewProjectName" + local fProjectDir="$currDir/$gitDoPaaSViewProjectName" # Extract npm project version from package.json local fBuildVersion=$(cat "$fProjectDir/package.json"|grep -E "\"version\":(\s)*"|awk -F ':' '{print $2}'|sed -r "s/\"//g"|sed 's/,//g'|sed 's/ //g') echo "$fBuildVersion" @@ -760,7 +760,7 @@ function makeNginxConf() { # See the License for the specific language governing permissions and # limitations under the License. # -# XCloud DoPaaS Servers Forward configuration. +# DoPaaS Servers Forward configuration. # (Notes: this deployment structure is only for routine deployment, It is # recommended to modify the production environment, for example: ELB/SLB/HAProxy/LVS) @@ -783,7 +783,7 @@ server { server_name dopaas.wl4g.${springProfilesActive}; include /etc/nginx/default.d/*.conf; location / { - root /usr/share/nginx/html/xcloud-dopaas-view-package/xcloud-dopaas-view-${fBuildVersion}-bin; + root /usr/share/nginx/html/dopaas-view-package/dopaas-view-${fBuildVersion}-bin; index index.html; } } diff --git a/script/deploy/deploy-host.sh b/script/deploy/deploy-host.sh index 3db1c3762a..b9a692778a 100644 --- a/script/deploy/deploy-host.sh +++ b/script/deploy/deploy-host.sh @@ -103,7 +103,7 @@ please refer to the template file: '$currDir/deploy-host.csv.tpl'" # Pull project sources, return(0/1) function pullSources() { - local projectName=$1 # e.g: xcloud-dopaas + local projectName=$1 # e.g: dopaas local cloneUrl=$2 local branch=$3 local projectDir="$currDir/$projectName" @@ -137,7 +137,7 @@ function pullSources() { # Pull and maven compile. function pullAndMvnCompile() { - local projectName=$1 # e.g xcloud-dopaas + local projectName=$1 # e.g dopaas local cloneUrl=$2 local branch=$3 local projectDir="$currDir/$projectName" @@ -306,10 +306,10 @@ function deployBackendAll() { # Deploying prepare services. log "Pulling and compile backend project sources ..." deployZookeeperServers - pullAndMvnCompile "$gitXCloudComponentProjectName" "$gitXCloudComponentUrl" "$gitComponentBranch" + pullAndMvnCompile "$gitDoPaaSInfraProjectName" "$gitDoPaaSInfraUrl" "$gitComponentBranch" deployEurekaServers - pullAndMvnCompile "$gitXCloudIamProjectName" "$gitXCloudIamUrl" "$gitIamBranch" - pullAndMvnCompile "$gitXCloudDoPaaSProjectName" "$gitXCloudDoPaaSUrl" "$gitDoPaaSBranch" + pullAndMvnCompile "$gitDoPaaSIamProjectName" "$gitDoPaaSIamUrl" "$gitIamBranch" + pullAndMvnCompile "$gitDoPaaSProjectName" "$gitDoPaaSUrl" "$gitDoPaaSBranch" deployNginxServers # Gets apps modules. @@ -428,7 +428,7 @@ function deployNginxServers() { fi # Configure nginx configuration and install. log "Configuring the nginx configuration file of dopaas services ..." - cd $workspaceDir && rm -rf nginx && cp -r $currDir/$gitXCloudDoPaaSProjectName/nginx . + cd $workspaceDir && rm -rf nginx && cp -r $currDir/$gitDoPaaSProjectName/nginx . makeNginxConf "$workspaceDir/nginx/conf.d/dopaas.conf" "$springProfilesActive" "${globalAllNodes[*]}" cd nginx && tar -cf nginxconf.tar * doScp "$user" "$passwd" "$host" "$workspaceDir/nginx/nginxconf.tar" "/etc/nginx/" "true" @@ -679,7 +679,7 @@ function deployFrontendAll() { if [ "$deployFrontendSkip" == "true" ]; then log "Skiped for deploy frontend application, You can set export deployFrontendSkip='true' to skip deploying the frontend!"; return 0 fi - local appName="$gitXCloudDoPaaSViewProjectName" + local appName="$gitDoPaaSViewProjectName" local appInstallDir="${deployFrontendAppBaseDir}/${appName}-package" local node=${globalAllNodes[0]} # First node deploy the nginx by default. local host=$(echo $node|awk -F 'ξ' '{print $1}') @@ -691,17 +691,17 @@ function deployFrontendAll() { { log "Deploying of dopaas $appName ..." # Pull frontend. - pullSources "$gitXCloudDoPaaSViewProjectName" "$gitXCloudDoPaaSViewUrl" "$gitDoPaaSViewBranch" + pullSources "$gitDoPaaSViewProjectName" "$gitDoPaaSViewUrl" "$gitDoPaaSViewBranch" # Compile frontend. if [[ $? == 1 || "$buildForcedOnPullUpToDate" == 'true' ]]; then - log "Compiling $cmdNpm $gitXCloudDoPaaSViewProjectName ..." + log "Compiling $cmdNpm $gitDoPaaSViewProjectName ..." sudo $cmdNpm install 2>&1 | tee -a $logFile sudo $cmdNpm run build 2>&1 | tee -a $logFile [ ${PIPESTATUS[0]} -ne 0 ] && exit -1 fi # Deploy frontend. - local fProjectDir="$currDir/$gitXCloudDoPaaSViewProjectName" + local fProjectDir="$currDir/$gitDoPaaSViewProjectName" # Extract npm project version from package.json local fBuildVersion=$(getFrontendBuildVersion) local deployFrontendDir="${appInstallDir}/${appName}-${fBuildVersion}-bin" @@ -711,12 +711,12 @@ function deployFrontendAll() { fi cd $fProjectDir && tar -zcf dist.tar.gz dist/ doRemoteCmd "$user" "$passwd" "$host" "mkdir -p $deployFrontendDir && \rm -rf $deployFrontendDir/*" "true" "true" - log "[$gitXCloudDoPaaSViewProjectName/$host] Transfer frontend assets to $deployFrontendDir ..." + log "[$gitDoPaaSViewProjectName/$host] Transfer frontend assets to $deployFrontendDir ..." doScp "$user" "$passwd" "$host" "$fProjectDir/dist.tar.gz" "$deployFrontendDir" "true" doRemoteCmd "$user" "$passwd" "$host" "cd $deployFrontendDir && tar -zxf dist.tar.gz --strip-components=1 && rm -rf dist.tar.gz && chmod 755 -R $deployFrontendDir" "true" "true" # Restart nginx(first install). doRemoteCmd "$user" "$passwd" "$host" "[ -n \"$(echo command -v systemctl)\" ] && sudo systemctl restart nginx || /etc/init.d/nginx.service restart" "false" "true" - log "[$gitXCloudDoPaaSViewProjectName/$host] Deployed frontend to remote '${deployFrontendDir}' completed." + log "[$gitDoPaaSViewProjectName/$host] Deployed frontend to remote '${deployFrontendDir}' completed." } & } @@ -727,14 +727,14 @@ function main() { fi [ -n "$(command -v clear)" ] && clear # e.g centos8+ not clear log "" - log "「 Welcome to XCloud DoPaaS Deployer (Host) 」" + log "「 Welcome to DoPaaS Deployer (Host) 」" log " \033[32m ___ ___ ___\033[0m" log " \033[32m| . \ ___ | . \ ___ ___ / __>\033[0m" log " \033[32m| | |/ . \| _/<_> |<_> |\__ \\\\\033[0m" log " \033[32m|___/\___/|_| <___|<___|<___/\033[0m" log "" - log " Wiki: https://github.com/wl4g/xcloud-dopaas/blob/master/README.md" - log " Wiki(CN): https://gitee.com/wl4g/xcloud-dopaas/blob/master/README_CN.md" + log " Wiki: https://github.com/wl4g/dopaas/blob/master/README.md" + log " Wiki(CN): https://gitee.com/wl4g/dopaas/blob/master/README_CN.md" log " Authors: " log " Version: 2.0.0" log " Time: $(date '+%Y-%m-%d %H:%M:%S')" diff --git a/script/deploy/dopaas-ctl.sh b/script/deploy/dopaas-ctl.sh index 90fc322ac7..62951c248c 100644 --- a/script/deploy/dopaas-ctl.sh +++ b/script/deploy/dopaas-ctl.sh @@ -22,14 +22,14 @@ [ -n "$(command -v clear)" ] && clear # e.g centos8+ not clear log "" -log "「 Welcome to XCloud DoPaaS Ctl (Host) 」" +log "「 Welcome to DoPaaS Ctl (Host) 」" log " ___ ___ ___ " log " | . \ ___ | . \ ___ ___ / __>" log " | | |/ . \| _/<_> |<_> |\__ \\" log " |___/\___/|_| <___|<___|<___/" log "" -log " Wiki: https://github.com/wl4g/xcloud-dopaas/blob/master/README.md" -log " Wiki(CN): https://gitee.com/wl4g/xcloud-dopaas/blob/master/README_CN.md" +log " Wiki: https://github.com/wl4g/dopaas/blob/master/README.md" +log " Wiki(CN): https://gitee.com/wl4g/dopaas/blob/master/README_CN.md" log " Authors: " log " Version: 2.0.0" log " Time: $(date '+%Y-%m-%d %H:%M:%S')" diff --git a/script/deploy/undeploy-host.sh b/script/deploy/undeploy-host.sh index 757dc90546..5c897a7ca8 100644 --- a/script/deploy/undeploy-host.sh +++ b/script/deploy/undeploy-host.sh @@ -23,10 +23,10 @@ export logFile="$currDir/undeploy-host.log"; rm -rf $logFile [ -n "$(command -v clear)" ] && clear # e.g centos8+ not clear log "" -log "「 Welcome to XCloud DoPaaS Uninstaller(Host) 」" +log "「 Welcome to DoPaaS Uninstaller(Host) 」" log "" -log " Wiki: https://github.com/wl4g/xcloud-dopaas/blob/master/README.md" -log " Wiki(CN): https://gitee.com/wl4g/xcloud-dopaas/blob/master/README_CN.md" +log " Wiki: https://github.com/wl4g/dopaas/blob/master/README.md" +log " Wiki(CN): https://gitee.com/wl4g/dopaas/blob/master/README_CN.md" log " Authors: " log " Version: 2.0.0" log " Time: $(date '+%Y-%m-%d %H:%M:%S')" @@ -103,7 +103,7 @@ function removeNginxAll() { local host=$(echo $node|awk -F 'ξ' '{print $1}') local user=$(echo $node|awk -F 'ξ' '{print $2}') local passwd=$(echo $node|awk -F 'ξ' '{print $3}') - local appName="$gitXCloudDoPaaSViewProjectName" + local appName="$gitDoPaaSViewProjectName" local appInstallDir="${deployFrontendAppBaseDir}/${appName}-package" log "[nginx/$host] Removing nginx for /etc/nginx/conf.d/dopaas.conf ..." doRemoteCmd "$user" "$passwd" "$host" "[ -f /etc/nginx/conf.d/dopaas.conf ] && rm -rf /etc/nginx/conf.d/dopaas.conf" "false" "true"