renamed modukle name so that pkgsite will work.

This commit is contained in:
Erik Brakkee 2024-08-12 21:31:15 +02:00
parent da638f0624
commit 54165f83c7
26 changed files with 46 additions and 46 deletions

View File

@ -6,6 +6,6 @@ Go version 1.21
``` ```
go install github.com/a-h/templ/cmd/templ@latest go install github.com/a-h/templ/cmd/templ@latest
go install golang.org/x/pkgsite/cmd/pkgsite@latest
``` ```

View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"converge/pkg/agent/session" "git.wamblee.org/converge/pkg/agent/session"
"io" "io"
"time" "time"
) )

View File

@ -2,13 +2,13 @@ package main
import ( import (
"bufio" "bufio"
"converge/pkg/agent/session"
"converge/pkg/agent/terminal"
"converge/pkg/comms"
"converge/pkg/support/iowrappers"
"converge/pkg/support/websocketutil"
"crypto/tls" "crypto/tls"
"fmt" "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/gliderlabs/ssh"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/pkg/sftp" "github.com/pkg/sftp"

View File

@ -2,8 +2,8 @@ package main
import ( import (
"bufio" "bufio"
"converge/pkg/agent/session"
"fmt" "fmt"
"git.wamblee.org/converge/pkg/agent/session"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"github.com/gliderlabs/ssh" "github.com/gliderlabs/ssh"
gossh "golang.org/x/crypto/ssh" gossh "golang.org/x/crypto/ssh"

View File

@ -2,9 +2,9 @@ package main
import ( import (
"context" "context"
"converge/pkg/server/converge"
"converge/pkg/support/websocketutil"
"fmt" "fmt"
"git.wamblee.org/converge/pkg/server/converge"
"git.wamblee.org/converge/pkg/support/websocketutil"
"log" "log"
"net" "net"
"net/http" "net/http"

View File

@ -1,8 +1,8 @@
package main package main
import ( import (
"converge/pkg/models" "git.wamblee.org/converge/pkg/models"
"converge/pkg/server/converge" "git.wamblee.org/converge/pkg/server/converge"
"net/http" "net/http"
"regexp" "regexp"
"strings" "strings"

View File

@ -1,6 +1,6 @@
package main package main
import "converge/pkg/models" import "git.wamblee.org/converge/pkg/models"
type StateNotifier struct { type StateNotifier struct {
webNotificationChannel chan *models.State webNotificationChannel chan *models.State

View File

@ -1,7 +1,7 @@
package main package main
import ( import (
templates2 "converge/pkg/server/templates" templates2 "git.wamblee.org/converge/pkg/server/templates"
"net/http" "net/http"
) )

View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"converge/pkg/models" "git.wamblee.org/converge/pkg/models"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promauto"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"

View File

@ -1,8 +1,8 @@
package main package main
import ( import (
"converge/pkg/server/templates"
"fmt" "fmt"
"git.wamblee.org/converge/pkg/server/templates"
"github.com/gliderlabs/ssh" "github.com/gliderlabs/ssh"
"math/rand" "math/rand"
"net/http" "net/http"

View File

@ -1,10 +1,10 @@
package main package main
import ( import (
"converge/pkg/support/iowrappers"
"converge/pkg/support/websocketutil"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"git.wamblee.org/converge/pkg/support/iowrappers"
"git.wamblee.org/converge/pkg/support/websocketutil"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"log" "log"
"net" "net"

View File

@ -2,9 +2,9 @@ package main
import ( import (
"context" "context"
"converge/pkg/comms" "git.wamblee.org/converge/pkg/comms"
"converge/pkg/models" "git.wamblee.org/converge/pkg/models"
templates2 "converge/pkg/server/templates" templates2 "git.wamblee.org/converge/pkg/server/templates"
"github.com/a-h/templ" "github.com/a-h/templ"
"log" "log"
"math/rand" "math/rand"

View File

@ -1,11 +1,11 @@
package main package main
import ( import (
"converge/pkg/comms"
"converge/pkg/support/iowrappers"
"converge/pkg/support/websocketutil"
"crypto/tls" "crypto/tls"
"fmt" "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" "github.com/gorilla/websocket"
"log" "log"
"net" "net"

View File

@ -1,9 +1,9 @@
package main package main
import ( import (
"converge/pkg/support/iowrappers"
"converge/pkg/support/websocketutil"
"fmt" "fmt"
"git.wamblee.org/converge/pkg/support/iowrappers"
"git.wamblee.org/converge/pkg/support/websocketutil"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"log" "log"
"net" "net"

2
go.mod
View File

@ -1,4 +1,4 @@
module converge module git.wamblee.org/converge
go 1.22.5 go 1.22.5

View File

@ -2,8 +2,8 @@ package session
import ( import (
"bytes" "bytes"
"converge/pkg/comms"
"fmt" "fmt"
"git.wamblee.org/converge/pkg/comms"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"github.com/gliderlabs/ssh" "github.com/gliderlabs/ssh"
"io" "io"

View File

@ -1,7 +1,7 @@
package comms package comms
import ( import (
"converge/pkg/support/websocketutil" "git.wamblee.org/converge/pkg/support/websocketutil"
"net" "net"
) )

View File

@ -1,7 +1,7 @@
package models package models
import ( import (
"converge/pkg/comms" "git.wamblee.org/converge/pkg/comms"
"time" "time"
) )

View File

@ -1,7 +1,7 @@
package models package models
import ( import (
"converge/pkg/comms" "git.wamblee.org/converge/pkg/comms"
"time" "time"
) )

View File

@ -1,11 +1,11 @@
package admin package admin
import ( import (
"converge/pkg/comms"
"converge/pkg/models"
"converge/pkg/support/concurrency"
iowrappers2 "converge/pkg/support/iowrappers"
"fmt" "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" "io"
"log" "log"
"math/rand" "math/rand"

View File

@ -1,11 +1,11 @@
package converge package converge
import ( import (
"converge/pkg/comms"
"converge/pkg/models"
"converge/pkg/server/admin"
iowrappers2 "converge/pkg/support/iowrappers"
"fmt" "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" "io"
"log" "log"
"time" "time"

View File

@ -1,6 +1,6 @@
package converge package converge
import "converge/pkg/models" import "git.wamblee.org/converge/pkg/models"
type Notifier interface { type Notifier interface {
Publish(state *models.State) Publish(state *models.State)

View File

@ -2,8 +2,8 @@ package converge
import ( import (
"context" "context"
"converge/pkg/models" "git.wamblee.org/converge/pkg/models"
"converge/pkg/server/templates" "git.wamblee.org/converge/pkg/server/templates"
"log" "log"
"net" "net"
"net/http" "net/http"

View File

@ -1,6 +1,6 @@
package templates package templates
import "converge/pkg/models" import "git.wamblee.org/converge/pkg/models"
templ Index(access models.ConvergeAccess) { templ Index(access models.ConvergeAccess) {

View File

@ -1,7 +1,7 @@
package templates package templates
import ( import (
"converge/pkg/models" "git.wamblee.org/converge/pkg/models"
"time" "time"
_ "time/tzdata" _ "time/tzdata"
) )

View File

@ -1,6 +1,6 @@
package templates package templates
import "converge/pkg/models" import "git.wamblee.org/converge/pkg/models"
templ AgentUsage(access models.ConvergeAccess, usageInputs UsageInputs) { templ AgentUsage(access models.ConvergeAccess, usageInputs UsageInputs) {