From 4f06fd71e006d388440d79a84c5486ea8ec105bb Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Mon, 12 Aug 2024 21:31:15 +0200 Subject: [PATCH] renamed modukle name so that pkgsite will work. --- README.md | 4 ++-- cmd/agent/activitydetector.go | 2 +- cmd/agent/agent.go | 10 +++++----- cmd/agent/sshauthorizedkeys.go | 2 +- cmd/converge/converge.go | 4 ++-- cmd/converge/convergeaccess.go | 4 ++-- cmd/converge/notifier.go | 2 +- cmd/converge/pagehandler.go | 2 +- cmd/converge/prometheus.go | 2 +- cmd/converge/usage.go | 2 +- cmd/tcptows/tcptows.go | 4 ++-- cmd/templaterender/render.go | 6 +++--- cmd/wsproxy/wsproxy.go | 6 +++--- cmd/wstotcp/wstotcp.go | 4 ++-- go.mod | 2 +- pkg/agent/session/session.go | 2 +- pkg/comms/agentlistener.go | 2 +- pkg/models/agent.go | 2 +- pkg/models/client.go | 2 +- pkg/server/admin/admin.go | 8 ++++---- pkg/server/converge/matchmaker.go | 8 ++++---- pkg/server/converge/notifier.go | 2 +- pkg/server/converge/websessions.go | 4 ++-- pkg/server/templates/index.templ | 2 +- pkg/server/templates/sessions.templ | 2 +- pkg/server/templates/usage.templ | 2 +- 26 files changed, 46 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index adc163b..34949a6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,6 @@ Go version 1.21 ``` go install github.com/a-h/templ/cmd/templ@latest +go install golang.org/x/pkgsite/cmd/pkgsite@latest - -``` \ No newline at end of file +``` diff --git a/cmd/agent/activitydetector.go b/cmd/agent/activitydetector.go index 5fa130b..98a5842 100644 --- a/cmd/agent/activitydetector.go +++ b/cmd/agent/activitydetector.go @@ -1,7 +1,7 @@ package main import ( - "converge/pkg/agent/session" + "git.wamblee.org/converge/pkg/agent/session" "io" "time" ) diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go index d720a35..e62c64f 100755 --- a/cmd/agent/agent.go +++ b/cmd/agent/agent.go @@ -2,13 +2,13 @@ package main import ( "bufio" - "converge/pkg/agent/session" - "converge/pkg/agent/terminal" - "converge/pkg/comms" - "converge/pkg/support/iowrappers" - "converge/pkg/support/websocketutil" "crypto/tls" "fmt" + "git.wamblee.org/converge/pkg/agent/session" + "git.wamblee.org/converge/pkg/agent/terminal" + "git.wamblee.org/converge/pkg/comms" + "git.wamblee.org/converge/pkg/support/iowrappers" + "git.wamblee.org/converge/pkg/support/websocketutil" "github.com/gliderlabs/ssh" "github.com/gorilla/websocket" "github.com/pkg/sftp" diff --git a/cmd/agent/sshauthorizedkeys.go b/cmd/agent/sshauthorizedkeys.go index 54a6007..5aed9f2 100644 --- a/cmd/agent/sshauthorizedkeys.go +++ b/cmd/agent/sshauthorizedkeys.go @@ -2,8 +2,8 @@ package main import ( "bufio" - "converge/pkg/agent/session" "fmt" + "git.wamblee.org/converge/pkg/agent/session" "github.com/fsnotify/fsnotify" "github.com/gliderlabs/ssh" gossh "golang.org/x/crypto/ssh" diff --git a/cmd/converge/converge.go b/cmd/converge/converge.go index ae3c343..8ffc575 100644 --- a/cmd/converge/converge.go +++ b/cmd/converge/converge.go @@ -2,9 +2,9 @@ package main import ( "context" - "converge/pkg/server/converge" - "converge/pkg/support/websocketutil" "fmt" + "git.wamblee.org/converge/pkg/server/converge" + "git.wamblee.org/converge/pkg/support/websocketutil" "log" "net" "net/http" diff --git a/cmd/converge/convergeaccess.go b/cmd/converge/convergeaccess.go index effea3a..5105f71 100644 --- a/cmd/converge/convergeaccess.go +++ b/cmd/converge/convergeaccess.go @@ -1,8 +1,8 @@ package main import ( - "converge/pkg/models" - "converge/pkg/server/converge" + "git.wamblee.org/converge/pkg/models" + "git.wamblee.org/converge/pkg/server/converge" "net/http" "regexp" "strings" diff --git a/cmd/converge/notifier.go b/cmd/converge/notifier.go index b266315..008c803 100644 --- a/cmd/converge/notifier.go +++ b/cmd/converge/notifier.go @@ -1,6 +1,6 @@ package main -import "converge/pkg/models" +import "git.wamblee.org/converge/pkg/models" type StateNotifier struct { webNotificationChannel chan *models.State diff --git a/cmd/converge/pagehandler.go b/cmd/converge/pagehandler.go index 4494039..cf48c88 100644 --- a/cmd/converge/pagehandler.go +++ b/cmd/converge/pagehandler.go @@ -1,7 +1,7 @@ package main import ( - templates2 "converge/pkg/server/templates" + templates2 "git.wamblee.org/converge/pkg/server/templates" "net/http" ) diff --git a/cmd/converge/prometheus.go b/cmd/converge/prometheus.go index e338e09..cc69d44 100644 --- a/cmd/converge/prometheus.go +++ b/cmd/converge/prometheus.go @@ -1,7 +1,7 @@ package main import ( - "converge/pkg/models" + "git.wamblee.org/converge/pkg/models" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/cmd/converge/usage.go b/cmd/converge/usage.go index 8858c2d..af30185 100644 --- a/cmd/converge/usage.go +++ b/cmd/converge/usage.go @@ -1,8 +1,8 @@ package main import ( - "converge/pkg/server/templates" "fmt" + "git.wamblee.org/converge/pkg/server/templates" "github.com/gliderlabs/ssh" "math/rand" "net/http" diff --git a/cmd/tcptows/tcptows.go b/cmd/tcptows/tcptows.go index 24ad3ad..153d9e7 100644 --- a/cmd/tcptows/tcptows.go +++ b/cmd/tcptows/tcptows.go @@ -1,10 +1,10 @@ package main import ( - "converge/pkg/support/iowrappers" - "converge/pkg/support/websocketutil" "crypto/tls" "fmt" + "git.wamblee.org/converge/pkg/support/iowrappers" + "git.wamblee.org/converge/pkg/support/websocketutil" "github.com/gorilla/websocket" "log" "net" diff --git a/cmd/templaterender/render.go b/cmd/templaterender/render.go index 9bc04e6..c69dd1d 100644 --- a/cmd/templaterender/render.go +++ b/cmd/templaterender/render.go @@ -2,9 +2,9 @@ package main import ( "context" - "converge/pkg/comms" - "converge/pkg/models" - templates2 "converge/pkg/server/templates" + "git.wamblee.org/converge/pkg/comms" + "git.wamblee.org/converge/pkg/models" + templates2 "git.wamblee.org/converge/pkg/server/templates" "github.com/a-h/templ" "log" "math/rand" diff --git a/cmd/wsproxy/wsproxy.go b/cmd/wsproxy/wsproxy.go index 8cf1f81..5407bf0 100644 --- a/cmd/wsproxy/wsproxy.go +++ b/cmd/wsproxy/wsproxy.go @@ -1,11 +1,11 @@ package main import ( - "converge/pkg/comms" - "converge/pkg/support/iowrappers" - "converge/pkg/support/websocketutil" "crypto/tls" "fmt" + "git.wamblee.org/converge/pkg/comms" + "git.wamblee.org/converge/pkg/support/iowrappers" + "git.wamblee.org/converge/pkg/support/websocketutil" "github.com/gorilla/websocket" "log" "net" diff --git a/cmd/wstotcp/wstotcp.go b/cmd/wstotcp/wstotcp.go index b6c6774..adbd82e 100644 --- a/cmd/wstotcp/wstotcp.go +++ b/cmd/wstotcp/wstotcp.go @@ -1,9 +1,9 @@ package main import ( - "converge/pkg/support/iowrappers" - "converge/pkg/support/websocketutil" "fmt" + "git.wamblee.org/converge/pkg/support/iowrappers" + "git.wamblee.org/converge/pkg/support/websocketutil" "github.com/gorilla/websocket" "log" "net" diff --git a/go.mod b/go.mod index 700389d..f3e4bb0 100755 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module converge +module git.wamblee.org/converge go 1.22.5 diff --git a/pkg/agent/session/session.go b/pkg/agent/session/session.go index 235f80c..4b0d5b2 100644 --- a/pkg/agent/session/session.go +++ b/pkg/agent/session/session.go @@ -2,8 +2,8 @@ package session import ( "bytes" - "converge/pkg/comms" "fmt" + "git.wamblee.org/converge/pkg/comms" "github.com/fsnotify/fsnotify" "github.com/gliderlabs/ssh" "io" diff --git a/pkg/comms/agentlistener.go b/pkg/comms/agentlistener.go index 2188ccd..95dabb1 100644 --- a/pkg/comms/agentlistener.go +++ b/pkg/comms/agentlistener.go @@ -1,7 +1,7 @@ package comms import ( - "converge/pkg/support/websocketutil" + "git.wamblee.org/converge/pkg/support/websocketutil" "net" ) diff --git a/pkg/models/agent.go b/pkg/models/agent.go index 41eedc2..2d3b54c 100644 --- a/pkg/models/agent.go +++ b/pkg/models/agent.go @@ -1,7 +1,7 @@ package models import ( - "converge/pkg/comms" + "git.wamblee.org/converge/pkg/comms" "time" ) diff --git a/pkg/models/client.go b/pkg/models/client.go index 504aacc..436e303 100644 --- a/pkg/models/client.go +++ b/pkg/models/client.go @@ -1,7 +1,7 @@ package models import ( - "converge/pkg/comms" + "git.wamblee.org/converge/pkg/comms" "time" ) diff --git a/pkg/server/admin/admin.go b/pkg/server/admin/admin.go index e25ba25..1f69957 100644 --- a/pkg/server/admin/admin.go +++ b/pkg/server/admin/admin.go @@ -1,11 +1,11 @@ package admin import ( - "converge/pkg/comms" - "converge/pkg/models" - "converge/pkg/support/concurrency" - iowrappers2 "converge/pkg/support/iowrappers" "fmt" + "git.wamblee.org/converge/pkg/comms" + "git.wamblee.org/converge/pkg/models" + "git.wamblee.org/converge/pkg/support/concurrency" + iowrappers2 "git.wamblee.org/converge/pkg/support/iowrappers" "io" "log" "math/rand" diff --git a/pkg/server/converge/matchmaker.go b/pkg/server/converge/matchmaker.go index a152948..d8561fb 100644 --- a/pkg/server/converge/matchmaker.go +++ b/pkg/server/converge/matchmaker.go @@ -1,11 +1,11 @@ package converge import ( - "converge/pkg/comms" - "converge/pkg/models" - "converge/pkg/server/admin" - iowrappers2 "converge/pkg/support/iowrappers" "fmt" + "git.wamblee.org/converge/pkg/comms" + "git.wamblee.org/converge/pkg/models" + "git.wamblee.org/converge/pkg/server/admin" + iowrappers2 "git.wamblee.org/converge/pkg/support/iowrappers" "io" "log" "time" diff --git a/pkg/server/converge/notifier.go b/pkg/server/converge/notifier.go index 361ca9a..f82ac60 100644 --- a/pkg/server/converge/notifier.go +++ b/pkg/server/converge/notifier.go @@ -1,6 +1,6 @@ package converge -import "converge/pkg/models" +import "git.wamblee.org/converge/pkg/models" type Notifier interface { Publish(state *models.State) diff --git a/pkg/server/converge/websessions.go b/pkg/server/converge/websessions.go index 27dfdd3..4c02328 100644 --- a/pkg/server/converge/websessions.go +++ b/pkg/server/converge/websessions.go @@ -2,8 +2,8 @@ package converge import ( "context" - "converge/pkg/models" - "converge/pkg/server/templates" + "git.wamblee.org/converge/pkg/models" + "git.wamblee.org/converge/pkg/server/templates" "log" "net" "net/http" diff --git a/pkg/server/templates/index.templ b/pkg/server/templates/index.templ index 947e97e..e0f0df9 100644 --- a/pkg/server/templates/index.templ +++ b/pkg/server/templates/index.templ @@ -1,6 +1,6 @@ package templates -import "converge/pkg/models" +import "git.wamblee.org/converge/pkg/models" templ Index(access models.ConvergeAccess) { diff --git a/pkg/server/templates/sessions.templ b/pkg/server/templates/sessions.templ index 9ff3416..c7a4b8d 100644 --- a/pkg/server/templates/sessions.templ +++ b/pkg/server/templates/sessions.templ @@ -1,7 +1,7 @@ package templates import ( - "converge/pkg/models" + "git.wamblee.org/converge/pkg/models" "time" _ "time/tzdata" ) diff --git a/pkg/server/templates/usage.templ b/pkg/server/templates/usage.templ index f40c9f2..e87042f 100644 --- a/pkg/server/templates/usage.templ +++ b/pkg/server/templates/usage.templ @@ -1,6 +1,6 @@ package templates -import "converge/pkg/models" +import "git.wamblee.org/converge/pkg/models" templ AgentUsage(access models.ConvergeAccess, usageInputs UsageInputs) {