diff --git a/outlinecaddy/app.go b/outlinecaddy/app.go index fa4b8d7d..a04ad58c 100644 --- a/outlinecaddy/app.go +++ b/outlinecaddy/app.go @@ -23,8 +23,8 @@ import ( "log/slog" "strings" - outline_prometheus "github.com/Jigsaw-Code/outline-ss-server/prometheus" - outline "github.com/Jigsaw-Code/outline-ss-server/service" + outline_prometheus "golang.getoutline.org/tunnel-server/prometheus" + outline "golang.getoutline.org/tunnel-server/service" "github.com/caddyserver/caddy/v2" "github.com/prometheus/client_golang/prometheus" ) diff --git a/outlinecaddy/cmd/caddy/main.go b/outlinecaddy/cmd/caddy/main.go index 6670ffd9..12119b88 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" + _ "golang.getoutline.org/tunnel-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..68f609d4 100644 --- a/outlinecaddy/go.mod +++ b/outlinecaddy/go.mod @@ -1,16 +1,16 @@ -module github.com/Jigsaw-Code/outline-ss-server/outlinecaddy +module golang.getoutline.org/tunnel-server/outlinecaddy go 1.23 require ( github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629 - github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20250204151340-93ebcb07dba9 - github.com/Jigsaw-Code/outline-ss-server v1.9.0 + github.com/Jigsaw-Code/outline-sdk/x v0.0.2-0.20250304133713-52f1a365e5ed github.com/caddyserver/caddy/v2 v2.9.1 github.com/iamd3vil/caddy_yaml_adapter v0.0.0-20200503183711-d479c29b475a github.com/mholt/caddy-l4 v0.0.0-20250102174933-6e5f5e311ead github.com/prometheus/client_golang v1.20.5 go.uber.org/zap v1.27.0 + golang.getoutline.org/tunnel-server v1.9.3-rc1 ) require ( @@ -89,7 +89,7 @@ require ( github.com/pires/go-proxyproto v0.7.1-0.20240628150027-b718e7ce4964 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.48.2 // indirect diff --git a/outlinecaddy/go.sum b/outlinecaddy/go.sum index 134db70f..c8346530 100644 --- a/outlinecaddy/go.sum +++ b/outlinecaddy/go.sum @@ -77,10 +77,8 @@ github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0= github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629 h1:sHi1X4vwtNNBUDCbxynGXe7cM/inwTbavowHziaxlbk= github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629/go.mod h1:CFDKyGZA4zatKE4vMLe8TyQpZCyINOeRFbMAmYHxodw= -github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20250204151340-93ebcb07dba9 h1:GKvH8vGir6MbJmWZfh/zNlBKl5z4TxCsfDnn8eHghMk= -github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20250204151340-93ebcb07dba9/go.mod h1:aFUEz6Z/eD0NS3c3fEIX+JO2D9aIrXCmWTb1zJFlItw= -github.com/Jigsaw-Code/outline-ss-server v1.9.0 h1:xxk2F/Xw2JBWNgLwOBaky73emcOIR3M+30xBlr3OCyk= -github.com/Jigsaw-Code/outline-ss-server v1.9.0/go.mod h1:ArtQJ43aUTB5r1gr27E6aMj4nDOZz5vG4WY4NNKJ6ZM= +github.com/Jigsaw-Code/outline-sdk/x v0.0.2-0.20250304133713-52f1a365e5ed h1:NfybsWzXQLPNueDsoPJMmvw/i7hWXqk9xaoA9X1cGgM= +github.com/Jigsaw-Code/outline-sdk/x v0.0.2-0.20250304133713-52f1a365e5ed/go.mod h1:aFUEz6Z/eD0NS3c3fEIX+JO2D9aIrXCmWTb1zJFlItw= github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -724,8 +722,8 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1028,6 +1026,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U= go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +golang.getoutline.org/tunnel-server v1.9.3-rc1 h1:IRQKbU9grdEtBzkta+4mAJ+slvyzL5EOIVm1mAUHtWM= +golang.getoutline.org/tunnel-server v1.9.3-rc1/go.mod h1:q++DzixfII/YZn4S4zNfWPtH+Wc+q0iif7x20dVMMbw= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/outlinecaddy/shadowsocks_handler.go b/outlinecaddy/shadowsocks_handler.go index 471a3c37..616cd5a4 100644 --- a/outlinecaddy/shadowsocks_handler.go +++ b/outlinecaddy/shadowsocks_handler.go @@ -25,7 +25,7 @@ import ( "github.com/caddyserver/caddy/v2" "github.com/mholt/caddy-l4/layer4" - outline "github.com/Jigsaw-Code/outline-ss-server/service" + outline "golang.getoutline.org/tunnel-server/service" ) const ssModuleName = "layer4.handlers.shadowsocks"