From af3e90c9648a7e6005922d0390e4a51c460d7605 Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Sat, 28 Jul 2018 17:52:59 +0200 Subject: [PATCH] Move from github.com/pstuifzand to p83.nl/go/ekster --- Dockerfile.alpine | 4 ++-- Dockerfile.ek | 2 +- README.md | 4 ++-- cmd/ek/main.go | 6 +++--- cmd/eksterd/fetch.go | 3 ++- cmd/eksterd/http.go | 6 +++--- cmd/eksterd/hubbackend.go | 5 +++-- cmd/eksterd/main.go | 2 +- cmd/eksterd/memory.go | 5 +++-- cmd/eksterd/micropub.go | 3 ++- cmd/eksterd/microsub.go | 3 ++- cmd/eksterd/null.go | 2 +- pkg/client/requests.go | 2 +- pkg/indieauth/auth.go | 2 +- 14 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 744b00d..6e15d59 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,7 +1,7 @@ # build stage FROM golang:1.10.2-alpine3.7 AS build-env RUN apk --no-cache add git -RUN go get github.com/pstuifzand/ekster/... +RUN go get p83.nl/go/ekster/... # final stage FROM alpine @@ -11,5 +11,5 @@ WORKDIR /opt/micropub EXPOSE 80 COPY --from=build-env /go/bin/eksterd /app/ RUN ["mkdir", "/app/templates"] -COPY --from=build-env /go/src/github.com/pstuifzand/ekster/templates /app/templates +COPY --from=build-env /go/src/p83.nl/go/ekster/templates /app/templates ENTRYPOINT ["/app/eksterd"] diff --git a/Dockerfile.ek b/Dockerfile.ek index c4b94c9..6215920 100644 --- a/Dockerfile.ek +++ b/Dockerfile.ek @@ -1,7 +1,7 @@ # build stage FROM golang:1.10.2-alpine3.7 AS build-env RUN apk --no-cache add git -RUN go get github.com/pstuifzand/ekster/cmd/ek +RUN go get p83.nl/go/ekster/cmd/ek # final stage FROM alpine diff --git a/README.md b/README.md index de255dc..830d087 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ Very alpha: no warranty. ekster is build using [go](https://golang.org). To be able to install ekster you need a Go environment. Use these commands to install the programs. - go get -u github.com/pstuifzand/ekster/cmd/eksterd - go get -u github.com/pstuifzand/ekster/cmd/ek + go get -u p83.nl/go/ekster/cmd/eksterd + go get -u p83.nl/go/ekster/cmd/ek `eksterd` uses [Redis](https://redis.io/) as the database, to temporarily save the items and feeds. The more permanent information is saved in `backend.json`. diff --git a/cmd/ek/main.go b/cmd/ek/main.go index 86fe402..a9f89f7 100644 --- a/cmd/ek/main.go +++ b/cmd/ek/main.go @@ -7,9 +7,9 @@ import ( "net/url" "os" - "github.com/pstuifzand/ekster/pkg/client" - "github.com/pstuifzand/ekster/pkg/indieauth" - "github.com/pstuifzand/ekster/pkg/microsub" + "p83.nl/go/ekster/pkg/client" + "p83.nl/go/ekster/pkg/indieauth" + "p83.nl/go/ekster/pkg/microsub" ) func init() { diff --git a/cmd/eksterd/fetch.go b/cmd/eksterd/fetch.go index e8e38f5..7a165be 100644 --- a/cmd/eksterd/fetch.go +++ b/cmd/eksterd/fetch.go @@ -34,8 +34,9 @@ import ( "strings" "time" + "p83.nl/go/ekster/pkg/microsub" + "github.com/garyburd/redigo/redis" - "github.com/pstuifzand/ekster/pkg/microsub" "willnorris.com/go/microformats" ) diff --git a/cmd/eksterd/http.go b/cmd/eksterd/http.go index 521fb4b..ed52b20 100644 --- a/cmd/eksterd/http.go +++ b/cmd/eksterd/http.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/pstuifzand/ekster/pkg/indieauth" - "github.com/pstuifzand/ekster/pkg/microsub" - "github.com/pstuifzand/ekster/pkg/util" + "p83.nl/go/ekster/pkg/indieauth" + "p83.nl/go/ekster/pkg/microsub" + "p83.nl/go/ekster/pkg/util" "github.com/alecthomas/template" "github.com/garyburd/redigo/redis" diff --git a/cmd/eksterd/hubbackend.go b/cmd/eksterd/hubbackend.go index 7eeac42..7bfecf6 100644 --- a/cmd/eksterd/hubbackend.go +++ b/cmd/eksterd/hubbackend.go @@ -10,9 +10,10 @@ import ( "strings" "time" + "p83.nl/go/ekster/pkg/util" + "p83.nl/go/ekster/pkg/websub" + "github.com/garyburd/redigo/redis" - "github.com/pstuifzand/ekster/pkg/util" - "github.com/pstuifzand/ekster/pkg/websub" ) // LeaseSeconds is the default number of seconds we want the subscription to last diff --git a/cmd/eksterd/main.go b/cmd/eksterd/main.go index d5970b2..eba7fea 100644 --- a/cmd/eksterd/main.go +++ b/cmd/eksterd/main.go @@ -28,7 +28,7 @@ import ( "cloud.google.com/go/profiler" "github.com/garyburd/redigo/redis" - "github.com/pstuifzand/ekster/pkg/microsub" + "p83.nl/go/ekster/pkg/microsub" ) const ( diff --git a/cmd/eksterd/memory.go b/cmd/eksterd/memory.go index f5f961e..4805711 100644 --- a/cmd/eksterd/memory.go +++ b/cmd/eksterd/memory.go @@ -28,9 +28,10 @@ import ( "strings" "time" + "p83.nl/go/ekster/pkg/feedbin" + "p83.nl/go/ekster/pkg/microsub" + "github.com/garyburd/redigo/redis" - "github.com/pstuifzand/ekster/pkg/feedbin" - "github.com/pstuifzand/ekster/pkg/microsub" "willnorris.com/go/microformats" ) diff --git a/cmd/eksterd/micropub.go b/cmd/eksterd/micropub.go index 3d65bab..78b17cd 100644 --- a/cmd/eksterd/micropub.go +++ b/cmd/eksterd/micropub.go @@ -9,8 +9,9 @@ import ( "strings" "time" + "p83.nl/go/ekster/pkg/microsub" + "github.com/garyburd/redigo/redis" - "github.com/pstuifzand/ekster/pkg/microsub" "willnorris.com/go/microformats" ) diff --git a/cmd/eksterd/microsub.go b/cmd/eksterd/microsub.go index 0b00657..ad6fc99 100644 --- a/cmd/eksterd/microsub.go +++ b/cmd/eksterd/microsub.go @@ -7,8 +7,9 @@ import ( "net/http" "os" + "p83.nl/go/ekster/pkg/microsub" + "github.com/garyburd/redigo/redis" - "github.com/pstuifzand/ekster/pkg/microsub" ) type microsubHandler struct { diff --git a/cmd/eksterd/null.go b/cmd/eksterd/null.go index d7e25a0..d3c0626 100644 --- a/cmd/eksterd/null.go +++ b/cmd/eksterd/null.go @@ -18,7 +18,7 @@ package main import ( - "github.com/pstuifzand/ekster/pkg/microsub" + "p83.nl/go/ekster/pkg/microsub" ) // NullBackend is the simplest possible backend diff --git a/pkg/client/requests.go b/pkg/client/requests.go index 2fddb4a..db0e725 100644 --- a/pkg/client/requests.go +++ b/pkg/client/requests.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/pstuifzand/ekster/pkg/microsub" + "p83.nl/go/ekster/pkg/microsub" ) type Client struct { diff --git a/pkg/indieauth/auth.go b/pkg/indieauth/auth.go index e072365..dd1fc7e 100644 --- a/pkg/indieauth/auth.go +++ b/pkg/indieauth/auth.go @@ -11,7 +11,7 @@ import ( "linkheader" - "github.com/pstuifzand/ekster/pkg/util" + "p83.nl/go/ekster/pkg/util" "willnorris.com/go/microformats" )