diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 23fb8642..6c65c304 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -54,5 +54,5 @@ jobs: run: | go run github.com/google/go-licenses check \ --allowed_licenses=Apache-2.0,Apache-3,BSD-2-Clause,BSD-2-Clause,BSD-3-Clause,BSD-4-Clause,CC0-1.0,ISC,MIT \ - --ignore github.com/Jigsaw-Code/outline-ss-server \ + --ignore github.com/OutlineFoundation/outline-ss-server \ ./... diff --git a/README.md b/README.md index d12045b2..96125b5c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Outline ss-server -[![Build Status](https://github.com/Jigsaw-Code/outline-ss-server/actions/workflows/go.yml/badge.svg)](https://github.com/Jigsaw-Code/outline-ss-server/actions/workflows/go.yml?query=branch%3Amaster) +[![Build Status](https://github.com/OutlineFoundation/outline-ss-server/actions/workflows/go.yml/badge.svg)](https://github.com/OutlineFoundation/outline-ss-server/actions/workflows/go.yml?query=branch%3Amaster) -[![Go Report Card](https://goreportcard.com/badge/github.com/Jigsaw-Code/outline-ss-server)](https://goreportcard.com/report/github.com/Jigsaw-Code/outline-ss-server) -[![Go Reference](https://pkg.go.dev/badge/github.com/Jigsaw-Code/outline-ss-server.svg)](https://pkg.go.dev/github.com/Jigsaw-Code/outline-ss-server) +[![Go Report Card](https://goreportcard.com/badge/github.com/OutlineFoundation/outline-ss-server)](https://goreportcard.com/report/github.com/OutlineFoundation/outline-ss-server) +[![Go Reference](https://pkg.go.dev/badge/github.com/OutlineFoundation/outline-ss-server.svg)](https://pkg.go.dev/github.com/OutlineFoundation/outline-ss-server) [![Mattermost](https://badgen.net/badge/Mattermost/Outline%20Community/blue)](https://community.internetfreedomfestival.org/community/channels/outline-community) [![Reddit](https://badgen.net/badge/Reddit/r%2Foutlinevpn/orange)](https://www.reddit.com/r/outlinevpn/) @@ -149,14 +149,14 @@ go run github.com/go-task/task/v3/cmd/task test You can benchmark the cipher finding code with ``` -go test -cpuprofile cpu.prof -memprofile mem.prof -bench . -benchmem -run=^$ github.com/Jigsaw-Code/outline-ss-server/shadowsocks +go test -cpuprofile cpu.prof -memprofile mem.prof -bench . -benchmem -run=^$ github.com/OutlineFoundation/outline-ss-server/shadowsocks ``` You can inspect the CPU or memory profiles with `go tool pprof cpu.prof` or `go tool pprof mem.prof`, and then enter `web` on the prompt. ## Release -We use [GoReleaser](https://goreleaser.com/) to build and upload binaries to our [GitHub releases](https://github.com/Jigsaw-Code/outline-ss-server/releases). +We use [GoReleaser](https://goreleaser.com/) to build and upload binaries to our [GitHub releases](https://github.com/OutlineFoundation/outline-ss-server/releases). Summary: - Test the build locally: @@ -177,7 +177,7 @@ Summary: ```bash go run github.com/go-task/task/v3/cmd/task release ``` -- Go to https://github.com/Jigsaw-Code/outline-ss-server/releases, review and publish the release. +- Go to https://github.com/OutlineFoundation/outline-ss-server/releases, review and publish the release. - Delete the Github token you created for the release on the [Personal Access Tokens page](https://github.com/settings/tokens). diff --git a/cmd/outline-ss-server/main.go b/cmd/outline-ss-server/main.go index 742fdf6f..6f0abf85 100644 --- a/cmd/outline-ss-server/main.go +++ b/cmd/outline-ss-server/main.go @@ -38,10 +38,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/term" - "github.com/Jigsaw-Code/outline-ss-server/ipinfo" - onet "github.com/Jigsaw-Code/outline-ss-server/net" - outline_prometheus "github.com/Jigsaw-Code/outline-ss-server/prometheus" - "github.com/Jigsaw-Code/outline-ss-server/service" + "github.com/OutlineFoundation/outline-ss-server/ipinfo" + onet "github.com/OutlineFoundation/outline-ss-server/net" + outline_prometheus "github.com/OutlineFoundation/outline-ss-server/prometheus" + "github.com/OutlineFoundation/outline-ss-server/service" ) var ( diff --git a/cmd/outline-ss-server/metrics.go b/cmd/outline-ss-server/metrics.go index 35ead166..dae4f9bb 100644 --- a/cmd/outline-ss-server/metrics.go +++ b/cmd/outline-ss-server/metrics.go @@ -17,7 +17,7 @@ package main import ( "time" - "github.com/Jigsaw-Code/outline-ss-server/service" + "github.com/OutlineFoundation/outline-ss-server/service" "github.com/prometheus/client_golang/prometheus" ) diff --git a/cmd/outline-ss-server/metrics_test.go b/cmd/outline-ss-server/metrics_test.go index 93cce446..d67f8911 100644 --- a/cmd/outline-ss-server/metrics_test.go +++ b/cmd/outline-ss-server/metrics_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/Jigsaw-Code/outline-ss-server/ipinfo" + "github.com/OutlineFoundation/outline-ss-server/ipinfo" "github.com/op/go-logging" "github.com/prometheus/client_golang/prometheus" promtest "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/cmd/outline-ss-server/server_test.go b/cmd/outline-ss-server/server_test.go index 3854d778..b5b2cff6 100644 --- a/cmd/outline-ss-server/server_test.go +++ b/cmd/outline-ss-server/server_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/Jigsaw-Code/outline-ss-server/prometheus" + "github.com/OutlineFoundation/outline-ss-server/prometheus" ) func TestRunOutlineServer(t *testing.T) { diff --git a/go.mod b/go.mod index efcf8fca..2955272b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Jigsaw-Code/outline-ss-server +module github.com/OutlineFoundation/outline-ss-server require ( github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629 diff --git a/internal/integration_test/integration_test.go b/internal/integration_test/integration_test.go index 3f95b00b..2e1c3433 100644 --- a/internal/integration_test/integration_test.go +++ b/internal/integration_test/integration_test.go @@ -28,8 +28,8 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport" "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" - "github.com/Jigsaw-Code/outline-ss-server/service" - "github.com/Jigsaw-Code/outline-ss-server/service/metrics" + "github.com/OutlineFoundation/outline-ss-server/service" + "github.com/OutlineFoundation/outline-ss-server/service/metrics" logging "github.com/op/go-logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/outlinecaddy/README.md b/outlinecaddy/README.md index 0221fe91..00d941d3 100644 --- a/outlinecaddy/README.md +++ b/outlinecaddy/README.md @@ -16,7 +16,7 @@ From this directory, build and run a custom Caddy binary with this Go module plu xcaddy build \ --with github.com/iamd3vil/caddy_yaml_adapter \ --with github.com/mholt/caddy-l4 \ - --with github.com/Jigsaw-Code/outline-ss-server/outlinecaddy + --with github.com/OutlineFoundation/outline-ss-server/outlinecaddy ./caddy run --config examples/simple.yaml --adapter yaml --watch ``` diff --git a/outlinecaddy/cmd/caddy/main.go b/outlinecaddy/cmd/caddy/main.go index 6670ffd9..4df298ad 100644 --- a/outlinecaddy/cmd/caddy/main.go +++ b/outlinecaddy/cmd/caddy/main.go @@ -24,7 +24,7 @@ package main import ( caddycmd "github.com/caddyserver/caddy/v2/cmd" - _ "github.com/Jigsaw-Code/outline-ss-server/outlinecaddy" + _ "github.com/OutlineFoundation/outline-ss-server/outlinecaddy" _ "github.com/caddyserver/caddy/v2/modules/standard" _ "github.com/iamd3vil/caddy_yaml_adapter" _ "github.com/mholt/caddy-l4" diff --git a/outlinecaddy/go.mod b/outlinecaddy/go.mod index 7f76ab14..0d60f2c7 100644 --- a/outlinecaddy/go.mod +++ b/outlinecaddy/go.mod @@ -1,4 +1,4 @@ -module github.com/Jigsaw-Code/outline-ss-server/outlinecaddy +module github.com/OutlineFoundation/outline-ss-server/outlinecaddy go 1.23 diff --git a/prometheus/metrics.go b/prometheus/metrics.go index ffc2a7de..2f658499 100644 --- a/prometheus/metrics.go +++ b/prometheus/metrics.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/Jigsaw-Code/outline-ss-server/ipinfo" - "github.com/Jigsaw-Code/outline-ss-server/service" - "github.com/Jigsaw-Code/outline-ss-server/service/metrics" + "github.com/OutlineFoundation/outline-ss-server/ipinfo" + "github.com/OutlineFoundation/outline-ss-server/service" + "github.com/OutlineFoundation/outline-ss-server/service/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/prometheus/metrics_test.go b/prometheus/metrics_test.go index 735b3dd4..a4b913ec 100644 --- a/prometheus/metrics_test.go +++ b/prometheus/metrics_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/Jigsaw-Code/outline-ss-server/ipinfo" - "github.com/Jigsaw-Code/outline-ss-server/service/metrics" + "github.com/OutlineFoundation/outline-ss-server/ipinfo" + "github.com/OutlineFoundation/outline-ss-server/service/metrics" "github.com/op/go-logging" "github.com/prometheus/client_golang/prometheus" promtest "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/service/shadowsocks.go b/service/shadowsocks.go index 668da1c8..94638bb2 100644 --- a/service/shadowsocks.go +++ b/service/shadowsocks.go @@ -21,7 +21,7 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport" - onet "github.com/Jigsaw-Code/outline-ss-server/net" + onet "github.com/OutlineFoundation/outline-ss-server/net" ) // 59 seconds is most common timeout for servers that do not respond to invalid requests diff --git a/service/tcp.go b/service/tcp.go index 50b6b0d7..548de23f 100644 --- a/service/tcp.go +++ b/service/tcp.go @@ -31,8 +31,8 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/shadowsocks/go-shadowsocks2/socks" - onet "github.com/Jigsaw-Code/outline-ss-server/net" - "github.com/Jigsaw-Code/outline-ss-server/service/metrics" + onet "github.com/OutlineFoundation/outline-ss-server/net" + "github.com/OutlineFoundation/outline-ss-server/service/metrics" ) // TCPConnMetrics is used to report metrics on TCP connections. diff --git a/service/tcp_linux.go b/service/tcp_linux.go index 82c63870..3b439c8f 100644 --- a/service/tcp_linux.go +++ b/service/tcp_linux.go @@ -22,7 +22,7 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport" - onet "github.com/Jigsaw-Code/outline-ss-server/net" + onet "github.com/OutlineFoundation/outline-ss-server/net" ) // fwmark can be used in conjunction with other Linux networking features like cgroups, network namespaces, and TC (Traffic Control) for sophisticated network management. diff --git a/service/tcp_other.go b/service/tcp_other.go index c86bb07c..07d0b8cd 100644 --- a/service/tcp_other.go +++ b/service/tcp_other.go @@ -22,7 +22,7 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport" - onet "github.com/Jigsaw-Code/outline-ss-server/net" + onet "github.com/OutlineFoundation/outline-ss-server/net" ) // fwmark can be used in conjunction with other Linux networking features like cgroups, network namespaces, and TC (Traffic Control) for sophisticated network management. diff --git a/service/tcp_test.go b/service/tcp_test.go index 9f5ecb60..149e7ccf 100644 --- a/service/tcp_test.go +++ b/service/tcp_test.go @@ -33,7 +33,7 @@ import ( "github.com/shadowsocks/go-shadowsocks2/socks" "github.com/stretchr/testify/require" - "github.com/Jigsaw-Code/outline-ss-server/service/metrics" + "github.com/OutlineFoundation/outline-ss-server/service/metrics" ) func init() { diff --git a/service/udp.go b/service/udp.go index e0303dc6..f1290dd8 100644 --- a/service/udp.go +++ b/service/udp.go @@ -30,8 +30,8 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks" "github.com/shadowsocks/go-shadowsocks2/socks" - "github.com/Jigsaw-Code/outline-ss-server/internal/slicepool" - onet "github.com/Jigsaw-Code/outline-ss-server/net" + "github.com/OutlineFoundation/outline-ss-server/internal/slicepool" + onet "github.com/OutlineFoundation/outline-ss-server/net" ) // NATMetrics is used to report NAT related metrics. diff --git a/service/udp_linux.go b/service/udp_linux.go index 788f18f9..d5373c39 100644 --- a/service/udp_linux.go +++ b/service/udp_linux.go @@ -24,7 +24,7 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport" - onet "github.com/Jigsaw-Code/outline-ss-server/net" + onet "github.com/OutlineFoundation/outline-ss-server/net" ) type udpListener struct { diff --git a/service/udp_other.go b/service/udp_other.go index a33d758f..e63007f3 100644 --- a/service/udp_other.go +++ b/service/udp_other.go @@ -23,7 +23,7 @@ import ( "github.com/Jigsaw-Code/outline-sdk/transport" - onet "github.com/Jigsaw-Code/outline-ss-server/net" + onet "github.com/OutlineFoundation/outline-ss-server/net" ) type udpListener struct { diff --git a/service/udp_test.go b/service/udp_test.go index 565837d1..9af3f92e 100644 --- a/service/udp_test.go +++ b/service/udp_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - onet "github.com/Jigsaw-Code/outline-ss-server/net" + onet "github.com/OutlineFoundation/outline-ss-server/net" ) const timeout = 5 * time.Minute