From c59d122e04a4ac1fb62c91bd08e5f2d5a068b687 Mon Sep 17 00:00:00 2001
From: d3m0k1d <d3m0k1d1337@gmail.com>
Date: Sat, 4 Apr 2026 05:46:42 +0300
Subject: [PATCH] fix: conflict

---
 agent/internal/config/config.go                 |   1 +
 agent/main.go                                   |   3 +++
 ...nchronous(normal)&pragma=busy_timeout(30000) | Bin 28672 -> 0 bytes
 infra/agent/config.yml                          |   3 ++-
 4 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 backend/?mode=rwc&pragma=journal_mode(wal)&pragma=synchronous(normal)&pragma=busy_timeout(30000)

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 15e7dfc4e26f2d3d01a1fed9964f0e121580cc78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28672
zcmeI&O=}uK7{KveW3-XjgkHqkTnZ6GNh<W(nq*rfzQwFiPs>E7vP9R!U6Y<u3c2(n
zv|p%SqaUKsOJ_AUZmOZZF8_snn`dTr=l2W?1ABT>bps_njK)J5h?22wn5OYY2*WTE
zdQa<pzJ>S6`HeoC3)ibI6UK`#zp`6Djnw9?@$}W!_pNW)ADg$?ud5nRjsOA(Ab<b@
z2q1s}0`V8PdA6R;l}hHP<3OGb)L8XhKN!ov9eGYLI#-^*q$qXRvdXq4?D9d?5=$zG
zoy>;Y6P3Dcy|Y@P*{amat&TXhI-=aR8<o25pk~$W-OR@HA;Pxa+oImkd%Ic{?Rw>;
zZRy}Zo~c1Js7oil>WPC!qk7-s$a-6DS8cJU!`-oxf$BMWU3H}2(yr7jF^?a%TP^)u
zCoDX*%eCfRcZ-!X1uK=xbxNk;dOh{gzZ~e5nj<H{XnOA~8LzXyq%hq~rgFui*_q1T
zb>pkciSoMY!R>lP^g(dPlS8$uTNZAVna<_&=I7_rK4%G<9TSlrW@Z18hVT)8K@X%K
zILjlWzUxKn-)HSY`u_E3+>6Gw^rN}HP~)NN`{Bg9a@BP-!MgE6d?-EH*D2{MFL<n;
z><#r>MrMlc$n_oB4csdgjr^G-dznIUEtPwnUo`<{xX#PjIay5nL*@Nh<u(09c@lnA
zvf*JnJg^~v00IagfB*srAb<b@2q1t!Tm>@Wz*zssHNA`r0R#|0009ILKmY**5I_Kd
zsQ~MLCISKoAb<b@2q1s}0tg_000QwB;Q#;l=a>;9fB*srAb<b@2q1s}0tg_$`ky&~
u00IagfB*srAb<b@2q1t!`~~>`KmIvpga{yj00IagfB*srAb<b@2>b?Ny(I4d

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