From 8485a0e4467dec7517c1f29b7f58a37dc1eba20d Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Tue, 26 Apr 2022 13:43:40 +0200 Subject: [PATCH] bugfix: update code to reflect new repository name --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .goreleaser.yml | 2 +- Makefile | 6 +++--- cmd/OliveTin/main.go | 8 ++++---- go.mod | 2 +- internal/acl/acl.go | 2 +- internal/executor/executor.go | 6 +++--- internal/executor/executor_test.go | 4 ++-- internal/grpcapi/grpcApi.go | 8 ++++---- internal/grpcapi/grpcApiActions.go | 6 +++--- internal/grpcapi/grpcApi_test.go | 4 ++-- internal/httpservers/httpServer.go | 2 +- internal/httpservers/restapi.go | 6 +++--- internal/httpservers/singleFrontend.go | 2 +- internal/httpservers/webuiServer.go | 6 +++--- internal/updatecheck/updateCheck.go | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f7f68cf..d7ba602 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ Don’t be afraid to ask for advice before working on a contribution. If you’r The preferred way to communicate is probably via Discord or GitHub issues. -Helpful information to understand the project can be found here: [CONTRIBUTING](https://github.com/jamesread/OliveTin/blob/main/CONTRIBUTING.adoc) +Helpful information to understand the project can be found here: [CONTRIBUTING](https://github.com/OliveTin/OliveTin/blob/main/CONTRIBUTING.adoc) ^^^ please delete the lines above when raising a PR to keep the request to the bare essentials ^^^ diff --git a/.goreleaser.yml b/.goreleaser.yml index 1c036ec..1e6755b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -137,7 +137,7 @@ docker_manifests: nfpms: - maintainer: James Read description: OliveTin is a web interface for running Linux shell commands. - homepage: https://github.com/jamesread/OliveTin + homepage: https://github.com/OliveTin/OliveTin license: AGPL-3.0 formats: - deb diff --git a/Makefile b/Makefile index f01204a..91a4de0 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ compile: daemon-compile-x64-lin daemon-compile-armhf: - GOARCH=arm GOARM=6 go build -o OliveTin.armhf github.com/jamesread/OliveTin/cmd/OliveTin + GOARCH=arm GOARM=6 go build -o OliveTin.armhf github.com/OliveTin/OliveTin/cmd/OliveTin daemon-compile-x64-lin: - GOOS=linux go build -o OliveTin github.com/jamesread/OliveTin/cmd/OliveTin + GOOS=linux go build -o OliveTin github.com/OliveTin/OliveTin/cmd/OliveTin daemon-compile-x64-win: - GOOS=windows GOARCH=amd64 go build -o OliveTin.exe github.com/jamesread/OliveTin/cmd/OliveTin + GOOS=windows GOARCH=amd64 go build -o OliveTin.exe github.com/OliveTin/OliveTin/cmd/OliveTin daemon-compile: daemon-compile-armhf daemon-compile-x64-lin daemon-compile-x64-win diff --git a/cmd/OliveTin/main.go b/cmd/OliveTin/main.go index d456bb5..d5f11d8 100644 --- a/cmd/OliveTin/main.go +++ b/cmd/OliveTin/main.go @@ -5,13 +5,13 @@ import ( log "github.com/sirupsen/logrus" - grpcapi "github.com/jamesread/OliveTin/internal/grpcapi" - updatecheck "github.com/jamesread/OliveTin/internal/updatecheck" + grpcapi "github.com/OliveTin/OliveTin/internal/grpcapi" + updatecheck "github.com/OliveTin/OliveTin/internal/updatecheck" - "github.com/jamesread/OliveTin/internal/httpservers" + "github.com/OliveTin/OliveTin/internal/httpservers" "github.com/fsnotify/fsnotify" - config "github.com/jamesread/OliveTin/internal/config" + config "github.com/OliveTin/OliveTin/internal/config" "github.com/spf13/viper" "os" "path" diff --git a/go.mod b/go.mod index 23887ca..c56ed6b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jamesread/OliveTin +module github.com/OliveTin/OliveTin go 1.16 diff --git a/internal/acl/acl.go b/internal/acl/acl.go index 62fca14..fd6e79b 100644 --- a/internal/acl/acl.go +++ b/internal/acl/acl.go @@ -2,7 +2,7 @@ package acl import ( "context" - config "github.com/jamesread/OliveTin/internal/config" + config "github.com/OliveTin/OliveTin/internal/config" log "github.com/sirupsen/logrus" ) diff --git a/internal/executor/executor.go b/internal/executor/executor.go index be9df4a..070f172 100644 --- a/internal/executor/executor.go +++ b/internal/executor/executor.go @@ -1,9 +1,9 @@ package executor import ( - pb "github.com/jamesread/OliveTin/gen/grpc" - acl "github.com/jamesread/OliveTin/internal/acl" - config "github.com/jamesread/OliveTin/internal/config" + pb "github.com/OliveTin/OliveTin/gen/grpc" + acl "github.com/OliveTin/OliveTin/internal/acl" + config "github.com/OliveTin/OliveTin/internal/config" log "github.com/sirupsen/logrus" "bytes" diff --git a/internal/executor/executor_test.go b/internal/executor/executor_test.go index 1b88f18..69c026a 100644 --- a/internal/executor/executor_test.go +++ b/internal/executor/executor_test.go @@ -4,8 +4,8 @@ import ( "github.com/stretchr/testify/assert" "testing" - acl "github.com/jamesread/OliveTin/internal/acl" - config "github.com/jamesread/OliveTin/internal/config" + acl "github.com/OliveTin/OliveTin/internal/acl" + config "github.com/OliveTin/OliveTin/internal/config" ) func TestSanitizeUnsafe(t *testing.T) { diff --git a/internal/grpcapi/grpcApi.go b/internal/grpcapi/grpcApi.go index 0ec2c8a..be4caee 100644 --- a/internal/grpcapi/grpcApi.go +++ b/internal/grpcapi/grpcApi.go @@ -2,14 +2,14 @@ package grpcapi import ( ctx "context" - pb "github.com/jamesread/OliveTin/gen/grpc" + pb "github.com/OliveTin/OliveTin/gen/grpc" log "github.com/sirupsen/logrus" "google.golang.org/grpc" "net" - acl "github.com/jamesread/OliveTin/internal/acl" - config "github.com/jamesread/OliveTin/internal/config" - executor "github.com/jamesread/OliveTin/internal/executor" + acl "github.com/OliveTin/OliveTin/internal/acl" + config "github.com/OliveTin/OliveTin/internal/config" + executor "github.com/OliveTin/OliveTin/internal/executor" ) var ( diff --git a/internal/grpcapi/grpcApiActions.go b/internal/grpcapi/grpcApiActions.go index d534182..c6fdf28 100644 --- a/internal/grpcapi/grpcApiActions.go +++ b/internal/grpcapi/grpcApiActions.go @@ -3,9 +3,9 @@ package grpcapi import ( "crypto/md5" "fmt" - pb "github.com/jamesread/OliveTin/gen/grpc" - acl "github.com/jamesread/OliveTin/internal/acl" - config "github.com/jamesread/OliveTin/internal/config" + pb "github.com/OliveTin/OliveTin/gen/grpc" + acl "github.com/OliveTin/OliveTin/internal/acl" + config "github.com/OliveTin/OliveTin/internal/config" ) func actionsCfgToPb(cfgActions []config.Action, user *acl.User) *pb.GetDashboardComponentsResponse { diff --git a/internal/grpcapi/grpcApi_test.go b/internal/grpcapi/grpcApi_test.go index 2024ae3..2a32f9e 100644 --- a/internal/grpcapi/grpcApi_test.go +++ b/internal/grpcapi/grpcApi_test.go @@ -12,8 +12,8 @@ import ( log "github.com/sirupsen/logrus" - pb "github.com/jamesread/OliveTin/gen/grpc" - config "github.com/jamesread/OliveTin/internal/config" + pb "github.com/OliveTin/OliveTin/gen/grpc" + config "github.com/OliveTin/OliveTin/internal/config" ) const bufSize = 1024 * 1024 diff --git a/internal/httpservers/httpServer.go b/internal/httpservers/httpServer.go index be581f7..19622fa 100644 --- a/internal/httpservers/httpServer.go +++ b/internal/httpservers/httpServer.go @@ -1,7 +1,7 @@ package httpservers import ( - config "github.com/jamesread/OliveTin/internal/config" + config "github.com/OliveTin/OliveTin/internal/config" ) // StartServers will start 3 HTTP servers. The WebUI, the Rest API, and a proxy diff --git a/internal/httpservers/restapi.go b/internal/httpservers/restapi.go index 1cbe924..4e5a46f 100644 --- a/internal/httpservers/restapi.go +++ b/internal/httpservers/restapi.go @@ -8,11 +8,11 @@ import ( "google.golang.org/protobuf/encoding/protojson" "net/http" - gw "github.com/jamesread/OliveTin/gen/grpc" + gw "github.com/OliveTin/OliveTin/gen/grpc" - cors "github.com/jamesread/OliveTin/internal/cors" + cors "github.com/OliveTin/OliveTin/internal/cors" - config "github.com/jamesread/OliveTin/internal/config" + config "github.com/OliveTin/OliveTin/internal/config" ) var ( diff --git a/internal/httpservers/singleFrontend.go b/internal/httpservers/singleFrontend.go index 9207dc0..6e4a926 100644 --- a/internal/httpservers/singleFrontend.go +++ b/internal/httpservers/singleFrontend.go @@ -9,7 +9,7 @@ away, and several other issues. */ import ( - config "github.com/jamesread/OliveTin/internal/config" + config "github.com/OliveTin/OliveTin/internal/config" log "github.com/sirupsen/logrus" "net/http" "net/http/httputil" diff --git a/internal/httpservers/webuiServer.go b/internal/httpservers/webuiServer.go index d801399..25cafc7 100644 --- a/internal/httpservers/webuiServer.go +++ b/internal/httpservers/webuiServer.go @@ -2,13 +2,13 @@ package httpservers import ( "encoding/json" - // cors "github.com/jamesread/OliveTin/internal/cors" + // cors "github.com/OliveTin/OliveTin/internal/cors" log "github.com/sirupsen/logrus" "net/http" "os" - config "github.com/jamesread/OliveTin/internal/config" - updatecheck "github.com/jamesread/OliveTin/internal/updatecheck" + config "github.com/OliveTin/OliveTin/internal/config" + updatecheck "github.com/OliveTin/OliveTin/internal/updatecheck" ) type webUISettings struct { diff --git a/internal/updatecheck/updateCheck.go b/internal/updatecheck/updateCheck.go index 812b0e6..db54cc6 100644 --- a/internal/updatecheck/updateCheck.go +++ b/internal/updatecheck/updateCheck.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/go-co-op/gocron" "github.com/google/uuid" - config "github.com/jamesread/OliveTin/internal/config" + config "github.com/OliveTin/OliveTin/internal/config" log "github.com/sirupsen/logrus" "io/ioutil" "net/http"