From f9f6fb64b9adf0900ed1d656c6ba0ac834943a35 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 15 May 2019 18:18:54 +0200 Subject: [PATCH] Build project from this github repository --- .gitlab-ci.yml | 4 ++-- Dockerfile | 8 ++++---- assets/dev.go | 4 ++-- assets/doc.go | 4 ++-- handlers/auth.go | 4 ++-- handlers/cert.go | 6 +++--- handlers/handlers.go | 2 +- main.go | 6 +++--- middleware/panic.go | 2 +- middleware/requirelogin.go | 2 +- router/router.go | 10 +++++----- services/clientstore.go | 2 +- views/templates.go | 2 +- views/views.go | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f7d7d5..e7d6fa9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: golang:latest variables: - REPO_NAME: git.klink.asia/paul/certman + REPO_NAME: github.com/zom-bi/ovpn-certman # The problem is that to be able to use go get, one needs to put # the repository in the $GOPATH. So for example if your gitlab domain @@ -41,7 +41,7 @@ compile: # generate assets - go get github.com/shurcooL/vfsgen/cmd/vfsgendev - - go generate git.klink.asia/paul/certman/assets + - go generate github.com/zom-bi/ovpn-certman/assets # build binaries -- list of supported plattforms is here: # https://stackoverflow.com/a/20728862 diff --git a/Dockerfile b/Dockerfile index af5016e..4196688 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM golang:1.12 -WORKDIR /go/src/git.klink.asia/paul/certman +WORKDIR /go/src/github.com/zom-bi/ovpn-certman ADD . . RUN \ - go get -tags="dev" -v git.klink.asia/paul/certman && \ + go get -tags="dev" -v github.com/zom-bi/ovpn-certman && \ go get github.com/shurcooL/vfsgen/cmd/vfsgendev && \ - go generate git.klink.asia/paul/certman/assets && \ + go generate github.com/zom-bi/ovpn-certman/assets && \ go build -tags="netgo" FROM scratch @@ -22,5 +22,5 @@ ENV \ VPN_PROTO="udp" \ APP_KEY="" COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=0 /go/src/git.klink.asia/paul/certman/certman / +COPY --from=0 /go/src/github.com/zom-bi/ovpn-certman/certman / ENTRYPOINT ["/certman"] diff --git a/assets/dev.go b/assets/dev.go index 766e46f..35494c5 100644 --- a/assets/dev.go +++ b/assets/dev.go @@ -12,8 +12,8 @@ import ( // Assets contains project assets. var Assets = union.New(map[string]http.FileSystem{ - "/static": http.Dir(importPathToDir("git.klink.asia/paul/certman/assets/static")), - "/templates": http.Dir(importPathToDir("git.klink.asia/paul/certman/assets/templates")), + "/static": http.Dir(importPathToDir("github.com/zom-bi/ovpn-certman/assets/static")), + "/templates": http.Dir(importPathToDir("github.com/zom-bi/ovpn-certman/assets/templates")), }) // importPathToDir is a helper function that resolves the absolute path of diff --git a/assets/doc.go b/assets/doc.go index e1685c5..7cedfdf 100644 --- a/assets/doc.go +++ b/assets/doc.go @@ -1,6 +1,6 @@ -//go:generate vfsgendev -source="git.klink.asia/paul/certman/assets".Assets +//go:generate vfsgendev -source="github.com/zom-bi/ovpn-certman/assets".Assets // Package assets contains assets the service, that will be embedded into // the binary. -// Regenerate by running `go generate git.klink.asia/paul/certman/assets`. +// Regenerate by running `go generate github.com/zom-bi/ovpn-certman/assets`. package assets diff --git a/handlers/auth.go b/handlers/auth.go index 5f1c7dc..6dbc8cc 100644 --- a/handlers/auth.go +++ b/handlers/auth.go @@ -6,10 +6,10 @@ import ( "net/http" "os" - "git.klink.asia/paul/certman/views" + "github.com/zom-bi/ovpn-certman/views" "golang.org/x/oauth2" - "git.klink.asia/paul/certman/services" + "github.com/zom-bi/ovpn-certman/services" ) func OAuth2Endpoint(p *services.Provider, config *oauth2.Config) http.HandlerFunc { diff --git a/handlers/cert.go b/handlers/cert.go index 60fbdbe..ff77c36 100644 --- a/handlers/cert.go +++ b/handlers/cert.go @@ -17,11 +17,11 @@ import ( "strings" "time" - "git.klink.asia/paul/certman/models" - "git.klink.asia/paul/certman/services" + "github.com/zom-bi/ovpn-certman/models" + "github.com/zom-bi/ovpn-certman/services" "github.com/go-chi/chi" - "git.klink.asia/paul/certman/views" + "github.com/zom-bi/ovpn-certman/views" ) func ListClientsHandler(p *services.Provider) http.HandlerFunc { diff --git a/handlers/handlers.go b/handlers/handlers.go index d131713..7a08414 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -3,7 +3,7 @@ package handlers import ( "net/http" - "git.klink.asia/paul/certman/views" + "github.com/zom-bi/ovpn-certman/views" ) func NotFoundHandler(w http.ResponseWriter, req *http.Request) { diff --git a/main.go b/main.go index eb74fc6..215c18e 100644 --- a/main.go +++ b/main.go @@ -7,10 +7,10 @@ import ( "os" "time" - "git.klink.asia/paul/certman/services" + "github.com/zom-bi/ovpn-certman/services" - "git.klink.asia/paul/certman/router" - "git.klink.asia/paul/certman/views" + "github.com/zom-bi/ovpn-certman/router" + "github.com/zom-bi/ovpn-certman/views" ) func main() { diff --git a/middleware/panic.go b/middleware/panic.go index 22f8bd6..a943ae3 100644 --- a/middleware/panic.go +++ b/middleware/panic.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime/debug" - "git.klink.asia/paul/certman/handlers" + "github.com/zom-bi/ovpn-certman/handlers" ) // Recoverer Listens for panic() calls and logs the stacktrace. diff --git a/middleware/requirelogin.go b/middleware/requirelogin.go index 1f18f30..f3b993e 100644 --- a/middleware/requirelogin.go +++ b/middleware/requirelogin.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "git.klink.asia/paul/certman/services" + "github.com/zom-bi/ovpn-certman/services" ) // RequireLogin is a middleware that checks for a username in the active diff --git a/router/router.go b/router/router.go index 36dbfc2..40fce9d 100644 --- a/router/router.go +++ b/router/router.go @@ -5,17 +5,17 @@ import ( "os" "strings" - "git.klink.asia/paul/certman/services" + "github.com/zom-bi/ovpn-certman/services" "golang.org/x/oauth2" - "git.klink.asia/paul/certman/assets" - "git.klink.asia/paul/certman/handlers" - "git.klink.asia/paul/certman/views" + "github.com/zom-bi/ovpn-certman/assets" + "github.com/zom-bi/ovpn-certman/handlers" + "github.com/zom-bi/ovpn-certman/views" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/gorilla/csrf" - mw "git.klink.asia/paul/certman/middleware" + mw "github.com/zom-bi/ovpn-certman/middleware" ) var ( diff --git a/services/clientstore.go b/services/clientstore.go index 3f47c67..dabfdf9 100644 --- a/services/clientstore.go +++ b/services/clientstore.go @@ -8,7 +8,7 @@ import ( "os" "sync" - "git.klink.asia/paul/certman/models" + "github.com/zom-bi/ovpn-certman/models" ) var ( diff --git a/views/templates.go b/views/templates.go index ec1655d..208264b 100644 --- a/views/templates.go +++ b/views/templates.go @@ -8,7 +8,7 @@ import ( "net/http" "path/filepath" - "git.klink.asia/paul/certman/assets" + "github.com/zom-bi/ovpn-certman/assets" ) // map of all parsed templates, by template name diff --git a/views/views.go b/views/views.go index f5185e6..b67468f 100644 --- a/views/views.go +++ b/views/views.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "git.klink.asia/paul/certman/services" + "github.com/zom-bi/ovpn-certman/services" "github.com/gorilla/csrf" )