From f71c1e5c5afa8a61892a77c4144e210738c96464 Mon Sep 17 00:00:00 2001 From: Mya Pitzeruse Date: Sat, 2 Jul 2022 22:01:26 -0500 Subject: [PATCH] fix: use new upstream address --- Makefile | 2 +- cmd/pages/main.go | 3 ++- go.mod | 2 +- internal/commands/host.go | 5 +++-- internal/pageviews/middleware.go | 6 +++--- internal/server.go | 11 ++++++----- internal/session/handler.go | 5 +++-- internal/session/middleware.go | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index ebdff6a..60a5a4b 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ docker: .docker docker/release: docker buildx build . \ --platform linux/amd64,linux/arm64 \ - --label "org.opencontainers.image.source=https://github.com/mjpitz/pages" \ + --label "org.opencontainers.image.source=https://code.pitz.tech/mya/pages" \ --label "org.opencontainers.image.version=$(VERSION)" \ --label "org.opencontainers.image.licenses=agpl3" \ --label "org.opencontainers.image.title=pages" \ diff --git a/cmd/pages/main.go b/cmd/pages/main.go index a23ef3c..7ad172e 100644 --- a/cmd/pages/main.go +++ b/cmd/pages/main.go @@ -25,10 +25,11 @@ import ( "github.com/urfave/cli/v2" + "code.pitz.tech/mya/pages/internal/commands" + "github.com/mjpitz/myago/flagset" "github.com/mjpitz/myago/lifecycle" "github.com/mjpitz/myago/zaputil" - "github.com/mjpitz/pages/internal/commands" ) var version = "" diff --git a/go.mod b/go.mod index d2031f5..f139d8d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mjpitz/pages +module code.pitz.tech/mya/pages go 1.18 diff --git a/internal/commands/host.go b/internal/commands/host.go index d52c1ff..d17c639 100644 --- a/internal/commands/host.go +++ b/internal/commands/host.go @@ -25,10 +25,11 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" + "code.pitz.tech/mya/pages/internal" + "code.pitz.tech/mya/pages/internal/git" + "github.com/mjpitz/myago/flagset" "github.com/mjpitz/myago/zaputil" - "github.com/mjpitz/pages/internal" - "github.com/mjpitz/pages/internal/git" ) type HostConfig struct { diff --git a/internal/pageviews/middleware.go b/internal/pageviews/middleware.go index 925c3bb..9f44bb0 100644 --- a/internal/pageviews/middleware.go +++ b/internal/pageviews/middleware.go @@ -22,9 +22,9 @@ import ( "github.com/gorilla/mux" - "github.com/mjpitz/pages/internal/excludes" - "github.com/mjpitz/pages/internal/geoip" - "github.com/mjpitz/pages/internal/metrics" + "code.pitz.tech/mya/pages/internal/excludes" + "code.pitz.tech/mya/pages/internal/geoip" + "code.pitz.tech/mya/pages/internal/metrics" ) type opt struct { diff --git a/internal/server.go b/internal/server.go index 8506fb5..bdb9917 100644 --- a/internal/server.go +++ b/internal/server.go @@ -26,16 +26,17 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "golang.org/x/sync/errgroup" + "code.pitz.tech/mya/pages/internal/excludes" + "code.pitz.tech/mya/pages/internal/geoip" + "code.pitz.tech/mya/pages/internal/pageviews" + "code.pitz.tech/mya/pages/internal/session" + "code.pitz.tech/mya/pages/internal/web" + "github.com/mjpitz/myago/auth" basicauth "github.com/mjpitz/myago/auth/basic" httpauth "github.com/mjpitz/myago/auth/http" "github.com/mjpitz/myago/headers" "github.com/mjpitz/myago/livetls" - "github.com/mjpitz/pages/internal/excludes" - "github.com/mjpitz/pages/internal/geoip" - "github.com/mjpitz/pages/internal/pageviews" - "github.com/mjpitz/pages/internal/session" - "github.com/mjpitz/pages/internal/web" ) // AdminConfig encapsulates configuration for the administrative endpoints. diff --git a/internal/session/handler.go b/internal/session/handler.go index d8cbf7b..44fb720 100644 --- a/internal/session/handler.go +++ b/internal/session/handler.go @@ -24,9 +24,10 @@ import ( "github.com/gorilla/websocket" "go.uber.org/zap" + "code.pitz.tech/mya/pages/internal/geoip" + "code.pitz.tech/mya/pages/internal/metrics" + "github.com/mjpitz/myago/zaputil" - "github.com/mjpitz/pages/internal/geoip" - "github.com/mjpitz/pages/internal/metrics" ) type Metric struct { diff --git a/internal/session/middleware.go b/internal/session/middleware.go index b78830b..1245f91 100644 --- a/internal/session/middleware.go +++ b/internal/session/middleware.go @@ -25,7 +25,7 @@ import ( "github.com/gorilla/mux" - "github.com/mjpitz/pages/internal/excludes" + "code.pitz.tech/mya/pages/internal/excludes" ) func script(path string) string {