[ Agent ] [ Executor ] - agent启动脚本

2023-10-24 10:30:19 +08:00
parent 5e23519ff5
commit cba4186e46
4 changed files with 97 additions and 94 deletions
--- a/agent-go/main-dev.go
+++ b/agent-go/main-dev.go
@@ -0,0 +1,59 @@
+package main
+
+import (
+	"agent-go/executor"
+	logger2 "agent-go/logger"
+	"agent-go/register"
+)
+
+var log = logger2.Log
+
+func main() {
+
+	var agentOP = &executor.AgentOsOperator{
+		InstallCommandPrefix: []string{
+			"apt-get", "install", "--allow-downgrades", "-y",
+		},
+		RemoveCommandPrefix: []string{"apt", "remove", "-y"},
+		CanAccessInternet:   true,
+		IsOsTypeUbuntu:      true,
+		IsAgentInnerWall:    false,
+		AgentArch:           "amd64",
+		AgentOSReleaseCode:  "focal",
+		AgentServerInfo: &register.AgentServerInfo{
+			ServerName:     "",
+			ServerIPPbV4:   "158.247.241.43",
+			ServerIPInV4:   "10.0.4.6",
+			ServerIPPbV6:   "",
+			ServerIPInV6:   "",
+			Location:       "",
+			Provider:       "",
+			ManagePort:     "",
+			CPUCore:        "",
+			CPUBrand:       "",
+			OSInfo:         "",
+			OSKernelInfo:   "",
+			TCPControl:     "",
+			Virtualization: "",
+			IoSpeed:        "",
+			MemoryTotal:    "",
+			DiskTotal:      "",
+			DiskUsage:      "",
+			Comment:        "",
+			MachineID:      "",
+			AgentVersion:   "",
+			TopicName:      "",
+		},
+		OssOfflinePrefix: "https://oss-s1.107421.xyz/",
+	}
+
+	//executor.BasicPrettyPrint(agentOP.Exec("shutdownFirewall"))
+	//executor.BasicPrettyPrint(agentOP.Exec("modifyHostname", "seoul-amd64-07"))
+	//executor.BasicPrettyPrint(agentOP.Exec("disableSwap"))
+	//executor.BasicPrettyPrint(agentOP.Exec("removeDocker"))
+	//executor.BasicPrettyPrint(agentOP.Exec("installDocker", "20"))
+	//executor.BasicPrettyPrint(agentOP.Exec("removeDockerCompose"))
+	executor.BasicPrettyPrint(agentOP.Exec("installDockerCompose"))
+	executor.BasicPrettyPrint(agentOP.Exec("installZSH"))
+
+}
--- a/agent-go/main-prod.go
+++ b/agent-go/main-prod.go
@@ -1,34 +0,0 @@
-package main
-
-//import (
-//	"agent-go/g"
-//	logger2 "agent-go/logger"
-//	"agent-go/register"
-//	"flag"
-//	"fmt"
-//)
-//
-//var log = logger2.Log
-//
-//func main() {
-//
-//	// 解析命令行参数
-//	var version string
-//	var agentServerInfoConf string
-//	flag.StringVar(&version, "version", "", "config file version")
-//	flag.StringVar(&agentServerInfoConf, "agentServerInfoConf", "", "agent server info conf file")
-//	flag.Parse()
-//	// 读取对应版本的配置文件
-//	filename := fmt.Sprintf("octopus-agent-%s.yaml", version)
-//	println("config file name is => " + filename)
-//	println("agent server info file is => " + agentServerInfoConf)
-//
-//	// 初始化Nacos的连接配置
-//	g.G.AgentConfig = register.ParseConfiguration(filename)
-//
-//	// 执行初始化之策工作
-//	businessForeverChan := INIT(agentServerInfoConf)
-//
-//	// 永远等待 runtime的队列消息
-//	<-businessForeverChan
-//}
--- a/agent-go/main.go
+++ b/agent-go/main.go
@@ -1,59 +1,34 @@
 package main

-import (
-	"agent-go/executor"
-	logger2 "agent-go/logger"
-	"agent-go/register"
-)
-
-var log = logger2.Log
-
-func main() {
-
-	var agentOP = &executor.AgentOsOperator{
-		InstallCommandPrefix: []string{
-			"apt-get", "install", "--allow-downgrades", "-y",
-		},
-		RemoveCommandPrefix: []string{"apt", "remove", "-y"},
-		CanAccessInternet:   true,
-		IsOsTypeUbuntu:      true,
-		IsAgentInnerWall:    false,
-		AgentArch:           "amd64",
-		AgentOSReleaseCode:  "focal",
-		AgentServerInfo: &register.AgentServerInfo{
-			ServerName:     "",
-			ServerIPPbV4:   "158.247.241.43",
-			ServerIPInV4:   "10.0.4.6",
-			ServerIPPbV6:   "",
-			ServerIPInV6:   "",
-			Location:       "",
-			Provider:       "",
-			ManagePort:     "",
-			CPUCore:        "",
-			CPUBrand:       "",
-			OSInfo:         "",
-			OSKernelInfo:   "",
-			TCPControl:     "",
-			Virtualization: "",
-			IoSpeed:        "",
-			MemoryTotal:    "",
-			DiskTotal:      "",
-			DiskUsage:      "",
-			Comment:        "",
-			MachineID:      "",
-			AgentVersion:   "",
-			TopicName:      "",
-		},
-		OssOfflinePrefix: "https://oss-s1.107421.xyz/",
-	}
-
-	//executor.BasicPrettyPrint(agentOP.Exec("shutdownFirewall"))
-	//executor.BasicPrettyPrint(agentOP.Exec("modifyHostname", "seoul-amd64-07"))
-	//executor.BasicPrettyPrint(agentOP.Exec("disableSwap"))
-	//executor.BasicPrettyPrint(agentOP.Exec("removeDocker"))
-	//executor.BasicPrettyPrint(agentOP.Exec("installDocker", "20"))
-	//executor.BasicPrettyPrint(agentOP.Exec("removeDockerCompose"))
-	executor.BasicPrettyPrint(agentOP.Exec("installDockerCompose"))
-	executor.BasicPrettyPrint(agentOP.Exec("installZSH"))
-
-}
+//import (
+//	"agent-go/g"
+//	logger2 "agent-go/logger"
+//	"agent-go/register"
+//	"flag"
+//	"fmt"
+//)
+//
+//var log = logger2.Log
+//
+//func main() {
+//
+//	// 解析命令行参数
+//	var version string
+//	var agentServerInfoConf string
+//	flag.StringVar(&version, "version", "", "config file version")
+//	flag.StringVar(&agentServerInfoConf, "agentServerInfoConf", "", "agent server info conf file")
+//	flag.Parse()
+//	// 读取对应版本的配置文件
+//	filename := fmt.Sprintf("octopus-agent-%s.yaml", version)
+//	println("config file name is => " + filename)
+//	println("agent server info file is => " + agentServerInfoConf)
+//
+//	// 初始化Nacos的连接配置
+//	g.G.AgentConfig = register.ParseConfiguration(filename)
+//
+//	// 执行初始化之策工作
+//	businessForeverChan := INIT(agentServerInfoConf)
+//
+//	// 永远等待 runtime的队列消息
+//	<-businessForeverChan
+//}
--- a/agent-go/shell/agent-bootup.sh
+++ b/agent-go/shell/agent-bootup.sh
@@ -2,8 +2,8 @@
 #!/bin/bash

 OctopusAgentUrl=https://happybirthday.107421.xyz/octopus-agent/
-OctopusAgentShell=https://happybirthday.107421.xyz/octopus-agent/shell
-AgentConfigUrl=https://happybirthday.107421.xyz/agent-config/
+OctopusAgentShell=https://happybirthday.107421.xyz/shell
+AgentConfigUrl=https://happybirthday.107421.xyz/agent-config
 OctopusAgentPath=/octopus-agent/shell
 #####  environment variables ######

@@ -281,7 +281,7 @@ CheckAndDownloadLatestVersion() {

  for agentConfig in "${agentConfigFileList[@]}"; do
      colorEcho $BLUE "agent config file is => $agentConfig"
-      wget -q "$AgentConfigUrl$agentConfig"
+      wget -q "$AgentConfigUrl/$agentConfig"
      echo ""
  done

@@ -372,7 +372,10 @@ BootUPAgent() {
  colorEcho $BLUE "开始配置Agent启动的基础环境信息！"
  wget ${OctopusAgentShell}/octopus-env.sh -qO $OctopusAgentPath/lib/octopus-env.sh
  chmod +x $OctopusAgentPath/lib/octopus-env.sh
+  echo ""
+  colorEcho $BLUE "开始获取Agent的系统信息！"
  $OctopusAgentPath/lib/octopus-env.sh
+  echo ""

  colorEcho $BLUE "start to daemon the octopus agent"
  systemdAgent