Skip to content

Commit 858c428

Browse files
authored
refactor(outlinecaddy): migrate outlinecaddy module to vanity URL (#275)
1 parent e3fb0cc commit 858c428

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

outlinecaddy/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"log/slog"
2424
"strings"
2525

26-
outline_prometheus "github.com/Jigsaw-Code/outline-ss-server/prometheus"
27-
outline "github.com/Jigsaw-Code/outline-ss-server/service"
26+
outline_prometheus "golang.getoutline.org/tunnel-server/prometheus"
27+
outline "golang.getoutline.org/tunnel-server/service"
2828
"github.com/caddyserver/caddy/v2"
2929
"github.com/prometheus/client_golang/prometheus"
3030
)

outlinecaddy/cmd/caddy/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package main
2424
import (
2525
caddycmd "github.com/caddyserver/caddy/v2/cmd"
2626

27-
_ "github.com/Jigsaw-Code/outline-ss-server/outlinecaddy"
27+
_ "golang.getoutline.org/tunnel-server/outlinecaddy"
2828
_ "github.com/caddyserver/caddy/v2/modules/standard"
2929
_ "github.com/iamd3vil/caddy_yaml_adapter"
3030
_ "github.com/mholt/caddy-l4"

outlinecaddy/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
module github.com/Jigsaw-Code/outline-ss-server/outlinecaddy
1+
module golang.getoutline.org/tunnel-server/outlinecaddy
22

33
go 1.23
44

55
require (
66
github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629
7-
github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20250204151340-93ebcb07dba9
8-
github.com/Jigsaw-Code/outline-ss-server v1.9.0
7+
github.com/Jigsaw-Code/outline-sdk/x v0.0.2-0.20250304133713-52f1a365e5ed
98
github.com/caddyserver/caddy/v2 v2.9.1
109
github.com/iamd3vil/caddy_yaml_adapter v0.0.0-20200503183711-d479c29b475a
1110
github.com/mholt/caddy-l4 v0.0.0-20250102174933-6e5f5e311ead
1211
github.com/prometheus/client_golang v1.20.5
1312
go.uber.org/zap v1.27.0
13+
golang.getoutline.org/tunnel-server v1.9.3-rc1
1414
)
1515

1616
require (
@@ -89,7 +89,7 @@ require (
8989
github.com/pires/go-proxyproto v0.7.1-0.20240628150027-b718e7ce4964 // indirect
9090
github.com/pkg/errors v0.9.1 // indirect
9191
github.com/prometheus/client_model v0.6.1 // indirect
92-
github.com/prometheus/common v0.61.0 // indirect
92+
github.com/prometheus/common v0.62.0 // indirect
9393
github.com/prometheus/procfs v0.15.1 // indirect
9494
github.com/quic-go/qpack v0.5.1 // indirect
9595
github.com/quic-go/quic-go v0.48.2 // indirect

outlinecaddy/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo
7777
github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
7878
github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629 h1:sHi1X4vwtNNBUDCbxynGXe7cM/inwTbavowHziaxlbk=
7979
github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629/go.mod h1:CFDKyGZA4zatKE4vMLe8TyQpZCyINOeRFbMAmYHxodw=
80-
github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20250204151340-93ebcb07dba9 h1:GKvH8vGir6MbJmWZfh/zNlBKl5z4TxCsfDnn8eHghMk=
81-
github.com/Jigsaw-Code/outline-sdk/x v0.0.0-20250204151340-93ebcb07dba9/go.mod h1:aFUEz6Z/eD0NS3c3fEIX+JO2D9aIrXCmWTb1zJFlItw=
82-
github.com/Jigsaw-Code/outline-ss-server v1.9.0 h1:xxk2F/Xw2JBWNgLwOBaky73emcOIR3M+30xBlr3OCyk=
83-
github.com/Jigsaw-Code/outline-ss-server v1.9.0/go.mod h1:ArtQJ43aUTB5r1gr27E6aMj4nDOZz5vG4WY4NNKJ6ZM=
80+
github.com/Jigsaw-Code/outline-sdk/x v0.0.2-0.20250304133713-52f1a365e5ed h1:NfybsWzXQLPNueDsoPJMmvw/i7hWXqk9xaoA9X1cGgM=
81+
github.com/Jigsaw-Code/outline-sdk/x v0.0.2-0.20250304133713-52f1a365e5ed/go.mod h1:aFUEz6Z/eD0NS3c3fEIX+JO2D9aIrXCmWTb1zJFlItw=
8482
github.com/Masterminds/glide v0.13.2/go.mod h1:STyF5vcenH/rUqTEv+/hBXlSTo7KYwg2oc2f4tzPWic=
8583
github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
8684
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
724722
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
725723
github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
726724
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
727-
github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
728-
github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
725+
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
726+
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
729727
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
730728
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
731729
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=
10281026
go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
10291027
go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
10301028
go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
1029+
golang.getoutline.org/tunnel-server v1.9.3-rc1 h1:IRQKbU9grdEtBzkta+4mAJ+slvyzL5EOIVm1mAUHtWM=
1030+
golang.getoutline.org/tunnel-server v1.9.3-rc1/go.mod h1:q++DzixfII/YZn4S4zNfWPtH+Wc+q0iif7x20dVMMbw=
10311031
golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
10321032
golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
10331033
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

outlinecaddy/shadowsocks_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/caddyserver/caddy/v2"
2626
"github.com/mholt/caddy-l4/layer4"
2727

28-
outline "github.com/Jigsaw-Code/outline-ss-server/service"
28+
outline "golang.getoutline.org/tunnel-server/service"
2929
)
3030

3131
const ssModuleName = "layer4.handlers.shadowsocks"

0 commit comments

Comments
 (0)