diff --git a/agent/internal/config/config.go b/agent/internal/config/config.go index 4093af9..6381206 100644 --- a/agent/internal/config/config.go +++ b/agent/internal/config/config.go @@ -8,6 +8,7 @@ import ( type AgentConfig struct { BackendURL string `yaml:"backend_url"` + GRPCURL string `yaml:"grpc_url"` RegistrationToken string `yaml:"registration_token"` Label string `yaml:"label"` CertDir string `yaml:"cert_dir"` diff --git a/agent/main.go b/agent/main.go index f65173a..9a4b665 100644 --- a/agent/main.go +++ b/agent/main.go @@ -4,6 +4,7 @@ import ( "context" "log" "os" + "strings" "gitea.d3m0k1d.ru/d3m0k1d/HellreigN/agent/internal/client" "gitea.d3m0k1d.ru/d3m0k1d/HellreigN/agent/internal/commander" @@ -63,8 +64,10 @@ func main() { defer cancel() cmdexe := new(commander.CommandExecutor) ccli := client.New(cmdexe, cfg.Label, cfg.Label) + // Use grpc_url for gRPC connection, strip scheme if present grpcAddr := cfg.GRPCURL if grpcAddr == "" { + // Fallback: derive from backend_url by stripping scheme grpcAddr = cfg.BackendURL } grpcAddr = strings.TrimPrefix(grpcAddr, "http://") diff --git a/backend/?mode=rwc&pragma=journal_mode(wal)&pragma=synchronous(normal)&pragma=busy_timeout(30000) b/backend/?mode=rwc&pragma=journal_mode(wal)&pragma=synchronous(normal)&pragma=busy_timeout(30000) deleted file mode 100644 index 15e7dfc..0000000 Binary files a/backend/?mode=rwc&pragma=journal_mode(wal)&pragma=synchronous(normal)&pragma=busy_timeout(30000) and /dev/null differ diff --git a/infra/agent/config.yml b/infra/agent/config.yml index 76854ab..1b572ea 100644 --- a/infra/agent/config.yml +++ b/infra/agent/config.yml @@ -1,4 +1,5 @@ backend_url: http://backend:8080 +grpc_url: backend:9001 label: test-agent-1 -registration_token: "" +registration_token: "156616b56774d59ba53f1eb4b096488bb5f755bbf5b737d93a42bb1b583ad7fb" cert_dir: /etc/hellreign-agent/certs