Merge pull request #57 from Fale/rename
bugfix: update code to reflect new repository name. Thank you very much @Fale
This commit is contained in:
commit
d3581e4829
|
|
@ -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 ^^^
|
||||
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ docker_manifests:
|
|||
nfpms:
|
||||
- maintainer: James Read <contact@jread.com>
|
||||
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
|
||||
|
|
|
|||
6
Makefile
6
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -1,4 +1,4 @@
|
|||
module github.com/jamesread/OliveTin
|
||||
module github.com/OliveTin/OliveTin
|
||||
|
||||
go 1.16
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in New Issue