diff --git a/certs/certs.go b/certs/certs.go index 016b301..6625ec0 100644 --- a/certs/certs.go +++ b/certs/certs.go @@ -4,9 +4,9 @@ import ( "crypto/tls" "crypto/x509/pkix" "fmt" + "github.com/1f349/violet/utils" "github.com/MrMelon54/certgen" "github.com/MrMelon54/rescheduler" - "github.com/MrMelon54/violet/utils" "io/fs" "log" "math/big" diff --git a/cmd/violet/serve.go b/cmd/violet/serve.go index 1978874..74684c5 100644 --- a/cmd/violet/serve.go +++ b/cmd/violet/serve.go @@ -6,17 +6,17 @@ import ( "encoding/json" "flag" "fmt" + "github.com/1f349/violet/certs" + "github.com/1f349/violet/domains" + errorPages "github.com/1f349/violet/error-pages" + "github.com/1f349/violet/favicons" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/router" + "github.com/1f349/violet/servers" + "github.com/1f349/violet/servers/api" + "github.com/1f349/violet/servers/conf" + "github.com/1f349/violet/utils" "github.com/MrMelon54/mjwt" - "github.com/MrMelon54/violet/certs" - "github.com/MrMelon54/violet/domains" - errorPages "github.com/MrMelon54/violet/error-pages" - "github.com/MrMelon54/violet/favicons" - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/router" - "github.com/MrMelon54/violet/servers" - "github.com/MrMelon54/violet/servers/api" - "github.com/MrMelon54/violet/servers/conf" - "github.com/MrMelon54/violet/utils" "github.com/google/subcommands" "io/fs" "log" diff --git a/cmd/violet/setup.go b/cmd/violet/setup.go index 087991f..617e02e 100644 --- a/cmd/violet/setup.go +++ b/cmd/violet/setup.go @@ -6,11 +6,11 @@ import ( "encoding/json" "flag" "fmt" + "github.com/1f349/violet/domains" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/router" + "github.com/1f349/violet/target" "github.com/AlecAivazis/survey/v2" - "github.com/MrMelon54/violet/domains" - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/router" - "github.com/MrMelon54/violet/target" "github.com/google/subcommands" "log" "net" diff --git a/domains/domains.go b/domains/domains.go index 212ba94..e7283b9 100644 --- a/domains/domains.go +++ b/domains/domains.go @@ -3,8 +3,8 @@ package domains import ( "database/sql" _ "embed" + "github.com/1f349/violet/utils" "github.com/MrMelon54/rescheduler" - "github.com/MrMelon54/violet/utils" "log" "strings" "sync" diff --git a/go.mod b/go.mod index 087bbf2..f48ea2b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/MrMelon54/violet +module github.com/1f349/violet go 1.20 diff --git a/router/manager.go b/router/manager.go index 08732f1..bcfd4cc 100644 --- a/router/manager.go +++ b/router/manager.go @@ -3,9 +3,9 @@ package router import ( "database/sql" _ "embed" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/target" "github.com/MrMelon54/rescheduler" - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/target" "log" "net/http" "sync" diff --git a/router/manager_test.go b/router/manager_test.go index 759a936..940ba5c 100644 --- a/router/manager_test.go +++ b/router/manager_test.go @@ -2,8 +2,8 @@ package router import ( "database/sql" - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/target" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/target" _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" "net/http" diff --git a/router/router.go b/router/router.go index 0f90deb..091e968 100644 --- a/router/router.go +++ b/router/router.go @@ -2,10 +2,10 @@ package router import ( "fmt" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/target" + "github.com/1f349/violet/utils" "github.com/MrMelon54/trie" - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/target" - "github.com/MrMelon54/violet/utils" "net/http" "strings" ) diff --git a/router/router_test.go b/router/router_test.go index 2d394ed..4fc0738 100644 --- a/router/router_test.go +++ b/router/router_test.go @@ -1,8 +1,8 @@ package router import ( - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/target" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/target" "net/http" "net/http/httptest" "net/url" diff --git a/servers/api/api.go b/servers/api/api.go index 1288c1d..a4c6064 100644 --- a/servers/api/api.go +++ b/servers/api/api.go @@ -2,10 +2,10 @@ package api import ( "encoding/json" + "github.com/1f349/violet/servers/conf" + "github.com/1f349/violet/utils" "github.com/MrMelon54/mjwt" "github.com/MrMelon54/mjwt/claims" - "github.com/MrMelon54/violet/servers/conf" - "github.com/MrMelon54/violet/utils" "github.com/julienschmidt/httprouter" "net/http" "time" diff --git a/servers/api/api_test.go b/servers/api/api_test.go index 10c4fcc..addc0f7 100644 --- a/servers/api/api_test.go +++ b/servers/api/api_test.go @@ -1,9 +1,9 @@ package api import ( - "github.com/MrMelon54/violet/servers/conf" - "github.com/MrMelon54/violet/utils" - "github.com/MrMelon54/violet/utils/fake" + "github.com/1f349/violet/servers/conf" + "github.com/1f349/violet/utils" + "github.com/1f349/violet/utils/fake" "github.com/stretchr/testify/assert" "net/http" "net/http/httptest" diff --git a/servers/api/auth.go b/servers/api/auth.go index 4696e9b..889e1eb 100644 --- a/servers/api/auth.go +++ b/servers/api/auth.go @@ -1,9 +1,9 @@ package api import ( + "github.com/1f349/violet/utils" "github.com/MrMelon54/mjwt" "github.com/MrMelon54/mjwt/auth" - "github.com/MrMelon54/violet/utils" "github.com/julienschmidt/httprouter" "net/http" ) diff --git a/servers/api/target-types.go b/servers/api/target-types.go index 04a30e0..348f486 100644 --- a/servers/api/target-types.go +++ b/servers/api/target-types.go @@ -1,7 +1,7 @@ package api import ( - "github.com/MrMelon54/violet/target" + "github.com/1f349/violet/target" ) type sourceJson struct { diff --git a/servers/api/target.go b/servers/api/target.go index 79be326..511fbe5 100644 --- a/servers/api/target.go +++ b/servers/api/target.go @@ -2,10 +2,10 @@ package api import ( "encoding/json" + "github.com/1f349/violet/router" + "github.com/1f349/violet/target" + "github.com/1f349/violet/utils" "github.com/MrMelon54/mjwt" - "github.com/MrMelon54/violet/router" - "github.com/MrMelon54/violet/target" - "github.com/MrMelon54/violet/utils" "github.com/julienschmidt/httprouter" "log" "net/http" diff --git a/servers/conf/conf.go b/servers/conf/conf.go index 69941fb..c8ee823 100644 --- a/servers/conf/conf.go +++ b/servers/conf/conf.go @@ -2,11 +2,11 @@ package conf import ( "database/sql" + errorPages "github.com/1f349/violet/error-pages" + "github.com/1f349/violet/favicons" + "github.com/1f349/violet/router" + "github.com/1f349/violet/utils" "github.com/MrMelon54/mjwt" - errorPages "github.com/MrMelon54/violet/error-pages" - "github.com/MrMelon54/violet/favicons" - "github.com/MrMelon54/violet/router" - "github.com/MrMelon54/violet/utils" ) // Conf stores the shared configuration for the API, HTTP and HTTPS servers. diff --git a/servers/http.go b/servers/http.go index a7166b3..673bffb 100644 --- a/servers/http.go +++ b/servers/http.go @@ -2,8 +2,8 @@ package servers import ( "fmt" - "github.com/MrMelon54/violet/servers/conf" - "github.com/MrMelon54/violet/utils" + "github.com/1f349/violet/servers/conf" + "github.com/1f349/violet/utils" "github.com/julienschmidt/httprouter" "net/http" "net/url" diff --git a/servers/http_test.go b/servers/http_test.go index 04428c4..81ea87b 100644 --- a/servers/http_test.go +++ b/servers/http_test.go @@ -2,9 +2,9 @@ package servers import ( "bytes" - "github.com/MrMelon54/violet/servers/conf" - "github.com/MrMelon54/violet/utils" - "github.com/MrMelon54/violet/utils/fake" + "github.com/1f349/violet/servers/conf" + "github.com/1f349/violet/utils" + "github.com/1f349/violet/utils/fake" "github.com/stretchr/testify/assert" "io" "net/http" diff --git a/servers/https.go b/servers/https.go index bf29a72..80b5839 100644 --- a/servers/https.go +++ b/servers/https.go @@ -3,9 +3,9 @@ package servers import ( "crypto/tls" "fmt" - "github.com/MrMelon54/violet/favicons" - "github.com/MrMelon54/violet/servers/conf" - "github.com/MrMelon54/violet/utils" + "github.com/1f349/violet/favicons" + "github.com/1f349/violet/servers/conf" + "github.com/1f349/violet/utils" "github.com/sethvargo/go-limiter/httplimit" "github.com/sethvargo/go-limiter/memorystore" "log" diff --git a/servers/https_test.go b/servers/https_test.go index 69d85c9..b0ce4a6 100644 --- a/servers/https_test.go +++ b/servers/https_test.go @@ -2,11 +2,11 @@ package servers import ( "database/sql" - "github.com/MrMelon54/violet/certs" - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/router" - "github.com/MrMelon54/violet/servers/conf" - "github.com/MrMelon54/violet/utils/fake" + "github.com/1f349/violet/certs" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/router" + "github.com/1f349/violet/servers/conf" + "github.com/1f349/violet/utils/fake" _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" "net/http" diff --git a/target/redirect.go b/target/redirect.go index 9428931..4e6766f 100644 --- a/target/redirect.go +++ b/target/redirect.go @@ -2,7 +2,7 @@ package target import ( "fmt" - "github.com/MrMelon54/violet/utils" + "github.com/1f349/violet/utils" "net/http" "net/url" "path" diff --git a/target/route.go b/target/route.go index 20178ba..842e0ab 100644 --- a/target/route.go +++ b/target/route.go @@ -3,8 +3,8 @@ package target import ( "context" "fmt" - "github.com/MrMelon54/violet/proxy" - "github.com/MrMelon54/violet/utils" + "github.com/1f349/violet/proxy" + "github.com/1f349/violet/utils" "github.com/rs/cors" "golang.org/x/net/http/httpguts" "io" diff --git a/target/route_test.go b/target/route_test.go index 3177318..51cf48e 100644 --- a/target/route_test.go +++ b/target/route_test.go @@ -2,7 +2,7 @@ package target import ( "bytes" - "github.com/MrMelon54/violet/proxy" + "github.com/1f349/violet/proxy" "github.com/stretchr/testify/assert" "io" "net/http" diff --git a/utils/fake/fake-compilable.go b/utils/fake/fake-compilable.go index 8dfd9f8..36cd6da 100644 --- a/utils/fake/fake-compilable.go +++ b/utils/fake/fake-compilable.go @@ -1,6 +1,6 @@ package fake -import "github.com/MrMelon54/violet/utils" +import "github.com/1f349/violet/utils" // Compilable implements utils.Compilable and stores if the Compile function // is called. diff --git a/utils/fake/fake-domains.go b/utils/fake/fake-domains.go index 5dee5ae..55e8d07 100644 --- a/utils/fake/fake-domains.go +++ b/utils/fake/fake-domains.go @@ -1,6 +1,6 @@ package fake -import "github.com/MrMelon54/violet/utils" +import "github.com/1f349/violet/utils" // Domains implements DomainProvider and makes sure `example.com` is valid type Domains struct{}