Merge branch 'dn2_int' into unstable

init/docker/hooks/build

@@ -7,6 +7,13 @@ source settings.sh
 
 docker buildx inspect
 
+mkdir -p ~/.ssh
+ssh-keyscan github.com >> ~/.ssh/known_hosts
+echo "${SUPERSECRET}" >> ~/.ssh/private_id
+ssh-add ~/.ssh/private_id
+git clone [email protected]:Notifiarr/private.git
+cp private/*.go pkg/private/
+
 if ! (docker buildx inspect | grep -Eq 'docker-container'); then
   echo "Creating docker builder instance"
   docker buildx create --use

pkg/private/.gitignore

@@ -0,0 +1 @@
+*.go

pkg/private/private.go

@@ -0,0 +1,16 @@
+package private
+
+//nolint:gochecknoglobals
+var (
+	kind = "custom"
+	from = "internal"
+)
+
+type Output struct {
+	Kind string `json:"kind"`
+	From string `json:"from"`
+}
+
+func Info() any {
+	return &Output{Kind: kind, From: from}
+}

pkg/website/server.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/Notifiarr/notifiarr/pkg/apps"
 	"github.com/Notifiarr/notifiarr/pkg/mnd"
+	"github.com/Notifiarr/notifiarr/pkg/private"
 	"github.com/shirou/gopsutil/v4/host"
 	"golift.io/cnfg"
 )
@@ -127,6 +128,7 @@ func (s *Server) sendPayload(ctx context.Context, uri string, payload interface{
 	if err == nil {
 		var torn map[string]interface{}
 		if err := json.Unmarshal(data, &torn); err == nil {
+			torn["private"] = private.Info()
 			if torn["host"], err = s.GetHostInfo(ctx); err != nil {
 				s.Config.Errorf("Host Info Unknown: %v", err)
 			}