feat: dws-0000 add onprem host to install and daemon

cmd/daemon.go

@@ -4,14 +4,13 @@ Copyright © 2022 Netmaker Team <info@netmaker.io>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/gravitl/netclient/functions"
 	"github.com/spf13/cobra"
 )
 
 var (
 	onpremDaemon bool
+	onpremHost   string
 )
 
 // daemonCmd represents the daemon command
@@ -20,14 +19,14 @@ var daemonCmd = &cobra.Command{
 	Short: "nodeshift daemon",
 	Long:  `nodeshift daemon gets and sends updates to netmaker server"`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("daemon called")
-		functions.Daemon(onpremDaemon)
+		functions.Daemon(onpremDaemon, onpremHost)
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(daemonCmd)
 	daemonCmd.Flags().BoolVarP(&onpremDaemon, "onprem", "", false, "set if using on-prem server")
+	daemonCmd.Flags().StringVarP(&onpremHost, "onprem-host", "", "", "set on-prem server host")
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command

cmd/install.go

@@ -9,7 +9,8 @@ import (
 )
 
 var (
-	onpremInstall bool
+	onpremInstall     bool
+	onpremInstallHost string
 )
 
 // installCmd represents the install command
@@ -22,13 +23,14 @@ var installCmd = &cobra.Command{
 
 ensure you specify the full path to then new binary to be installed`,
 	Run: func(cmd *cobra.Command, args []string) {
-		functions.Install(onpremInstall)
+		functions.Install(onpremInstall, onpremInstallHost)
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(installCmd)
 	installCmd.Flags().BoolVarP(&onpremInstall, "onprem", "", false, "set if using on-prem server")
+	installCmd.Flags().StringVarP(&onpremInstallHost, "onprem-host", "", "", "set on-prem server host")
 
 	// Here you will define your flags and configuration settings.
 

daemon/common.go

@@ -12,8 +12,8 @@ import (
 )
 
 // Install - Calls the correct function to install the netclient as a daemon service on the given operating system.
-func Install(onprem bool) error {
-	return install(onprem)
+func Install(onprem bool, onpremHost string) error {
+	return install(onprem, onpremHost)
 }
 
 // Restart - restarts a system daemon

daemon/common_darwin.go

@@ -15,7 +15,7 @@ const MacServiceName = "com.gravitl.netclient"
 const MacExecDir = "/usr/local/bin/"
 
 // install- Creates a daemon service from the netclient under LaunchAgents for MacOS
-func install(onprem bool) error {
+func install(onprem bool, onpremHost string) error {
 	stop()
 	binarypath, err := os.Executable()
 	if err != nil {

daemon/common_linux.go

@@ -15,7 +15,7 @@ import (
 
 const ExecDir = "/sbin/"
 
-func install(onprem bool) error {
+func install(onprem bool, onpremHost string) error {
 	slog.Info("installing netclient binary")
 	binarypath, err := os.Executable()
 	if err != nil {
@@ -33,7 +33,7 @@ func install(onprem bool) error {
 	slog.Info("install netclient service file")
 	switch config.Netclient().InitType {
 	case config.Systemd:
-		return setupSystemDDaemon(onprem)
+		return setupSystemDDaemon(onprem, onpremHost)
 	case config.SysVInit:
 		return setupSysVint()
 	case config.OpenRC:

daemon/systemd_linux.go

@@ -23,7 +23,7 @@ User=root
 Type=simple
 ExecStartPre=/bin/sleep 17
 {{- if .OnPrem }}
-ExecStart=/sbin/netclient daemon --onprem
+ExecStart=/sbin/netclient daemon --onprem --onprem-host {{.OnPremHost}}
 {{- else }}
 ExecStart=/sbin/netclient daemon
 {{- end }}
@@ -35,17 +35,18 @@ WantedBy=multi-user.target
 `
 
 type UnitData struct {
-	OnPrem bool
+	OnPrem     bool
+	OnPremHost string
 }
 
 // setupSystemDDaemon - sets system daemon for supported machines
-func setupSystemDDaemon(onprem bool) error {
+func setupSystemDDaemon(onprem bool, onpremHost string) error {
 	tmpl, err := template.New("unit").Parse(systemdTemplate)
 	if err != nil {
 		return fmt.Errorf("error parsing systemd template: %w", err)
 	}
 	var buf bytes.Buffer
-	err = tmpl.Execute(&buf, UnitData{OnPrem: onprem})
+	err = tmpl.Execute(&buf, UnitData{OnPrem: onprem, OnPremHost: onpremHost})
 	if err != nil {
 		return fmt.Errorf("error executing systemd template: %w", err)
 	}

functions/daemon.go

@@ -18,6 +18,7 @@ import (
 	"github.com/gravitl/netclient/config"
 	"github.com/gravitl/netclient/daemon"
 	"github.com/gravitl/netclient/firewall"
+	"github.com/gravitl/netclient/internal/nodeshift"
 	"github.com/gravitl/netclient/local"
 	"github.com/gravitl/netclient/ncutils"
 	"github.com/gravitl/netclient/networking"
@@ -50,8 +51,14 @@ type cachedMessage struct {
 }
 
 // Daemon runs netclient daemon
-func Daemon(onprem bool) {
+func Daemon(onprem bool, onpremHost string) {
 	slog.Info("starting netclient daemon", "version", config.Version)
+	slog.Info("setting netclient daemon onprem", "onprem", onprem)
+	slog.Info("setting netclient daemon onprem-host", "onprem-host", onpremHost)
+
+	nodeshift.OnPrem = onprem
+	nodeshift.OnPremHost = onpremHost
+
 	daemon.RemoveAllLockFiles()
 	go deleteAllDNS()
 	if err := ncutils.SavePID(); err != nil {
@@ -429,7 +436,6 @@ func setHostSubscription(client mqtt.Client, server string) {
 		slog.Error("unable to subscribe to host updates", "host", hostID, "server", server, "error", token.Error())
 		return
 	}
-
 }
 
 // setSubcriptions sets MQ client subscriptions for a specific node config

functions/install.go

@@ -12,7 +12,7 @@ import (
 )
 
 // Install - installs binary/daemon
-func Install(onprem bool) error {
+func Install(onprem bool, onpremHost string) error {
 	source, err := os.Executable()
 	if err != nil {
 		return err
@@ -29,7 +29,7 @@ func Install(onprem bool) error {
 		slog.Warn("stopping netclient daemon", "error", err)
 	}
 	time.Sleep(time.Second << 1)
-	if err := daemon.Install(onprem); err != nil {
+	if err := daemon.Install(onprem, onpremHost); err != nil {
 		slog.Error("daemon install error", "error", err)
 		return err
 	}

internal/nodeshift/client.go

@@ -12,6 +12,11 @@ import (
 	"github.com/gravitl/netmaker/models"
 )
 
+var (
+	OnPrem     = false
+	OnPremHost = ""
+)
+
 type request struct {
 	ID      int    `json:"id"`
 	Uuid    string `json:"uuid"`
@@ -81,6 +86,10 @@ func getIDHost(server string) (string, int, error) {
 		return "", 0, fmt.Errorf("failed to convert id to int: %s", err)
 	}
 
+	if OnPrem {
+		return OnPremHost, id, nil
+	}
+
 	if strings.HasSuffix(server, "nodeshift.network") {
 		return backendHostProduction, id, nil
 	} else if strings.HasSuffix(server, "nodeshift.co") {