Merge branch 'devel'

gogrlx · Nov 7, 2023 · bd012b4 · bd012b4
2 parents 341b4c0 + c14d868
commit bd012b4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/api/client/nats.go b/api/client/nats.go
@@ -13,7 +13,7 @@ import (
 )
 
 func NewNatsClient() (*nats.Conn, error) {
-	URL := config.FarmerBusInterface
+	URL := config.FarmerBusURL
 	pubkey, err := auth.GetPubkey()
 	if err != nil {
 		return nil, err
@@ -39,5 +39,5 @@ func NewNatsClient() (*nats.Conn, error) {
 	connOpts := []nats.Option{nats.Name("grlx-cli"), nats.Nkey(pubkey, auth.Sign), nats.Secure(config)}
 
 	log.Tracef("Connecting to %s", URL)
-	return nats.Connect("nats://"+URL, connOpts...)
+	return nats.Connect(URL, connOpts...)
 }
diff --git a/cmd/farmer/main.go b/cmd/farmer/main.go
@@ -142,7 +142,7 @@ func ConnectFarmer() {
 	connectionAttempts := 1
 	maxFarmerReconnect := 30
 	RootCA := config.RootCA
-	FarmerBusPort := config.FarmerBusPort
+	BusURL := config.FarmerBusURL
 	FarmerInterface := config.FarmerInterface
 	if FarmerInterface == "0.0.0.0" {
 		FarmerInterface = "localhost"
@@ -171,7 +171,7 @@ func ConnectFarmer() {
 	}
 	_ = config
 	log.Debug("Attempting to pair Farmer to NATS bus.")
-	nc, err := nats.Connect("tls://"+FarmerInterface+":"+FarmerBusPort, // nats.RootCAs(RootCA),
+	nc, err := nats.Connect(BusURL,
 		nats.Secure(config),
 		opt,
 		nats.RetryOnFailedConnect(true),

diff --git a/cmd/sprout/main.go b/cmd/sprout/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"fmt"
 	"os"
 	"time"
 
@@ -76,7 +75,7 @@ func ConnectSprout() {
 	var err error
 	SproutRootCA := config.SproutRootCA
 	FarmerInterface := config.FarmerInterface
-	FarmerBusPort := config.FarmerBusPort
+	FarmerBusURL := config.FarmerBusURL
 	opt, err := nats.NkeyOptionFromSeed(config.NKeySproutPrivFile)
 	if err != nil {
 		// TODO: handle error
@@ -96,7 +95,7 @@ func ConnectSprout() {
 		RootCAs:    certPool,
 		MinVersion: tls.VersionTLS12,
 	}
-	nc, err := nats.Connect(fmt.Sprintf("tls://%s:%s", FarmerInterface, FarmerBusPort), nats.Secure(config), opt,
+	nc, err := nats.Connect(FarmerBusURL, nats.Secure(config), opt,
 		nats.MaxReconnects(-1),
 		nats.ReconnectWait(time.Second*15),
 		nats.DisconnectHandler(func(_ *nats.Conn) {
@@ -106,7 +105,7 @@ func ConnectSprout() {
 	)
 	for err != nil {
 		time.Sleep(time.Second * 15)
-		nc, err = nats.Connect(fmt.Sprintf("tls://%s:%s", FarmerInterface, FarmerBusPort), nats.Secure(config), opt,
+		nc, err = nats.Connect(FarmerBusURL, nats.Secure(config), opt,
 			nats.MaxReconnects(-1),
 			nats.ReconnectWait(time.Second*15),
 			// TODO: Add a reconnect handler

diff --git a/config/config.go b/config/config.go
@@ -29,7 +29,7 @@ var (
 	CertificateValidTime time.Duration
 	ConfigRoot           string
 	FarmerAPIPort        string
-	FarmerBusInterface   string
+	FarmerBusURL         string
 	FarmerBusPort        string
 	FarmerInterface      string
 	FarmerOrganization   string
@@ -129,8 +129,8 @@ func LoadConfig(binary string) {
 			jety.SetDefault("nkeyfarmerprivfile", "/etc/grlx/pki/farmer/farmer.nkey")
 			jety.SetDefault("rootca", "/etc/grlx/pki/farmer/tls-rootca.pem")
 			jety.SetDefault("rootcapriv", "/etc/grlx/pki/farmer/tls-rootca-key.pem")
-			jety.SetDefault("organization", "grlx farmer")
-			jety.SetDefault("farmerbusinterface", jety.GetString("farmerinterface"))
+			jety.SetDefault("farmerorganization", "grlx farmer")
+			jety.SetDefault("farmerbusinterface", jety.GetString("farmerinterface")+":"+jety.GetString("FarmerBusPort"))
 			JobLogDir = jety.GetString("joblogdir")
 			CertHosts = jety.GetStringSlice("certhosts")
 			logLevel := jety.GetString("loglevel")
@@ -211,7 +211,6 @@ func LoadConfig(binary string) {
 			jety.SetDefault("nkeysproutpubfile", "/etc/grlx/pki/sprout/sprout.nkey.pub")
 			jety.SetDefault("joblogdir", "/var/cache/grlx/sprout/jobs")
 			jety.SetDefault("nkeysproutprivfile", "/etc/grlx/pki/sprout/sprout.nkey")
-			jety.SetDefault("farmerbusinterface", FarmerInterface+":"+jety.GetString("FarmerBusPort"))
 			jety.SetDefault("cachedir", "/var/cache/grlx/sprout/files/provided")
 			logLevel := jety.GetString("loglevel")
 			switch logLevel {
@@ -243,7 +242,7 @@ func LoadConfig(binary string) {
 	CertificateValidTime = jety.GetDuration("certificatevalidtime")
 	ConfigRoot = jety.GetString("configroot")
 	FarmerAPIPort = jety.GetString("farmerapiport")
-	FarmerBusInterface = jety.GetString("farmerbusinterface")
+	FarmerBusURL = "tls://" + jety.GetString("farmerbusinterface") + ":" + jety.GetString("farmerbusport")
 	FarmerBusPort = jety.GetString("farmerbusport")
 	FarmerInterface = jety.GetString("farmerinterface")
 	FarmerPKI = jety.GetString("farmerpki")