diff --git a/Makefile b/Makefile index a011b84..00cf533 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ prepare-vendor: govendor sync goimports: - @goimports -w -local github.com/octavore/ketchup $(GO_DIRS) + @goimports -w -local github.com/ketchuphq/ketchup $(GO_DIRS) test: @go test $(GO_DIRS) diff --git a/db/backend.go b/db/backend.go index 2fc8004..27ed59a 100644 --- a/db/backend.go +++ b/db/backend.go @@ -3,8 +3,8 @@ package db import ( "io" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) // Backend interface for models. diff --git a/db/bolt/bolt.go b/db/bolt/bolt.go index 9ba70b7..72aa581 100644 --- a/db/bolt/bolt.go +++ b/db/bolt/bolt.go @@ -11,10 +11,10 @@ import ( "github.com/octavore/naga/service" "github.com/octavore/nagax/logger" - "github.com/octavore/ketchup/db" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/server/config" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/db" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/server/config" + "github.com/ketchuphq/ketchup/util/errors" ) type BoltConfig struct { diff --git a/db/bolt/bolt_test.go b/db/bolt/bolt_test.go index 82aaaa4..95b8a1a 100644 --- a/db/bolt/bolt_test.go +++ b/db/bolt/bolt_test.go @@ -7,7 +7,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/octavore/naga/service" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) func TestRoutes(t *testing.T) { diff --git a/db/bolt/pages.go b/db/bolt/pages.go index ff34c84..85acf89 100644 --- a/db/bolt/pages.go +++ b/db/bolt/pages.go @@ -5,8 +5,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/satori/go.uuid" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) const PAGE_BUCKET = "pages" diff --git a/db/bolt/routes.go b/db/bolt/routes.go index 84a65cb..1a7f50d 100644 --- a/db/bolt/routes.go +++ b/db/bolt/routes.go @@ -5,7 +5,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/satori/go.uuid" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) const ROUTE_BUCKET = "routes" diff --git a/db/bolt/users.go b/db/bolt/users.go index 1575988..dee9be9 100644 --- a/db/bolt/users.go +++ b/db/bolt/users.go @@ -5,8 +5,8 @@ import ( "github.com/golang/protobuf/proto" uuid "github.com/satori/go.uuid" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/util/errors" ) const USER_BUCKET = "users" diff --git a/db/bolt/users_test.go b/db/bolt/users_test.go index 56a3fa2..3a7b77c 100644 --- a/db/bolt/users_test.go +++ b/db/bolt/users_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/octavore/naga/service" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) func TestUser(t *testing.T) { diff --git a/db/dummy/dummy.go b/db/dummy/dummy.go index a41a56c..758a55a 100644 --- a/db/dummy/dummy.go +++ b/db/dummy/dummy.go @@ -3,8 +3,8 @@ package dummy import ( "io" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) type DummyDB struct { diff --git a/db/export.go b/db/export.go index c33464a..38afaa9 100644 --- a/db/export.go +++ b/db/export.go @@ -7,7 +7,7 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/octavore/naga/service" - "github.com/octavore/ketchup/proto/ketchup/models/export" + "github.com/ketchuphq/ketchup/proto/ketchup/models/export" ) var marshaler = &jsonpb.Marshaler{ diff --git a/db/interfaces.go b/db/interfaces.go index d869ec7..64de4be 100644 --- a/db/interfaces.go +++ b/db/interfaces.go @@ -3,7 +3,7 @@ package db import ( "github.com/golang/protobuf/proto" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) type AddressableProto interface { diff --git a/db/module.go b/db/module.go index 034b0ac..3a21be7 100644 --- a/db/module.go +++ b/db/module.go @@ -5,7 +5,7 @@ import ( "github.com/octavore/naga/service" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/util/errors" ) type Module struct { diff --git a/db/sort.go b/db/sort.go index 94fa8c3..afba2b0 100644 --- a/db/sort.go +++ b/db/sort.go @@ -3,7 +3,7 @@ package db import ( "sort" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) var _ sort.Interface = &sortPages{} diff --git a/db/sort_test.go b/db/sort_test.go index dd1b0e7..75c48ae 100644 --- a/db/sort_test.go +++ b/db/sort_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) func TestSort(t *testing.T) { diff --git a/main.go b/main.go index b092e3a..8831fa5 100644 --- a/main.go +++ b/main.go @@ -3,12 +3,12 @@ package main import ( "github.com/octavore/naga/service" - "github.com/octavore/ketchup/admin" - "github.com/octavore/ketchup/db/bolt" - "github.com/octavore/ketchup/server/api" - "github.com/octavore/ketchup/server/backup" - "github.com/octavore/ketchup/server/content" - "github.com/octavore/ketchup/server/tls" + "github.com/ketchuphq/ketchup/admin" + "github.com/ketchuphq/ketchup/db/bolt" + "github.com/ketchuphq/ketchup/server/api" + "github.com/ketchuphq/ketchup/server/backup" + "github.com/ketchuphq/ketchup/server/content" + "github.com/ketchuphq/ketchup/server/tls" ) // set by goreleaser diff --git a/make/proto.mk b/make/proto.mk index 41efc4c..d91180b 100644 --- a/make/proto.mk +++ b/make/proto.mk @@ -7,7 +7,7 @@ PROTO_FILES=$(shell find . -name "*.proto") INCL_PROTO_DIR=$(shell find . -name "*.proto" -exec dirname {} \; | sort -u | sed -e 's/^/-I/') INCL_WKT=-I $$GOPATH/src/github.com/golang/protobuf/ptypes/struct -PROTO_PREFIX=import_prefix_proto=github.com/octavore/ketchup/proto/ +PROTO_PREFIX=import_prefix_proto=github.com/ketchuphq/ketchup/proto/ protos: @mkdir -p proto diff --git a/plugins/pkg/clone.go b/plugins/pkg/clone.go index 385e7bf..59b1652 100644 --- a/plugins/pkg/clone.go +++ b/plugins/pkg/clone.go @@ -13,7 +13,7 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/object" "gopkg.in/src-d/go-git.v4/storage/memory" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) // Clone the given repo to {data_dir}/{dir}/{name} diff --git a/plugins/pkg/module.go b/plugins/pkg/module.go index 7368a34..45010af 100644 --- a/plugins/pkg/module.go +++ b/plugins/pkg/module.go @@ -15,9 +15,9 @@ import ( "github.com/octavore/naga/service" - "github.com/octavore/ketchup/proto/ketchup/packages" - "github.com/octavore/ketchup/server/config" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/packages" + "github.com/ketchuphq/ketchup/server/config" + "github.com/ketchuphq/ketchup/util/errors" ) // Module pkg manages downloading pkg diff --git a/plugins/pkg/registry.go b/plugins/pkg/registry.go index 119911f..4d43f48 100644 --- a/plugins/pkg/registry.go +++ b/plugins/pkg/registry.go @@ -9,8 +9,8 @@ import ( "github.com/golang/protobuf/proto" - "github.com/octavore/ketchup/proto/ketchup/packages" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/packages" + "github.com/ketchuphq/ketchup/util/errors" ) type Registry struct { diff --git a/proto/ketchup/api/api.pb.go b/proto/ketchup/api/api.pb.go index 3983faf..23fe205 100644 --- a/proto/ketchup/api/api.pb.go +++ b/proto/ketchup/api/api.pb.go @@ -58,8 +58,8 @@ package api import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import ketchup_models "github.com/octavore/ketchup/proto/ketchup/models" -import structpb "github.com/octavore/ketchup/proto/structpb" +import ketchup_models "github.com/ketchuphq/ketchup/proto/ketchup/models" +import structpb "github.com/ketchuphq/ketchup/proto/structpb" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/proto/ketchup/models/export/export.pb.go b/proto/ketchup/models/export/export.pb.go index 4cf0119..546e576 100644 --- a/proto/ketchup/models/export/export.pb.go +++ b/proto/ketchup/models/export/export.pb.go @@ -7,7 +7,7 @@ package export import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import ketchup_models "github.com/octavore/ketchup/proto/ketchup/models" +import ketchup_models "github.com/ketchuphq/ketchup/proto/ketchup/models" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/server/api/module.go b/server/api/module.go index c669dce..1dd4472 100644 --- a/server/api/module.go +++ b/server/api/module.go @@ -9,14 +9,14 @@ import ( "github.com/octavore/naga/service" "github.com/octavore/nagax/logger" - "github.com/octavore/ketchup/db" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/server/config" - "github.com/octavore/ketchup/server/content" - "github.com/octavore/ketchup/server/content/templates" - "github.com/octavore/ketchup/server/router" - "github.com/octavore/ketchup/server/tls" - "github.com/octavore/ketchup/server/users" + "github.com/ketchuphq/ketchup/db" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/server/config" + "github.com/ketchuphq/ketchup/server/content" + "github.com/ketchuphq/ketchup/server/content/templates" + "github.com/ketchuphq/ketchup/server/router" + "github.com/ketchuphq/ketchup/server/tls" + "github.com/ketchuphq/ketchup/server/users" ) var KetchupVersion = "" diff --git a/server/api/pages.go b/server/api/pages.go index b01edb4..dd3d063 100644 --- a/server/api/pages.go +++ b/server/api/pages.go @@ -7,12 +7,12 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/julienschmidt/httprouter" - "github.com/octavore/ketchup/db" - "github.com/octavore/ketchup/db/bolt" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/proto/structpb" - "github.com/octavore/ketchup/server/router" + "github.com/ketchuphq/ketchup/db" + "github.com/ketchuphq/ketchup/db/bolt" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/structpb" + "github.com/ketchuphq/ketchup/server/router" ) func (m *Module) getPage(par httprouter.Params, fn func(*models.Page) error) (*models.Page, error) { diff --git a/server/api/routes.go b/server/api/routes.go index c22ac63..2b3f5c6 100644 --- a/server/api/routes.go +++ b/server/api/routes.go @@ -9,10 +9,10 @@ import ( "github.com/julienschmidt/httprouter" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/server/router" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/server/router" + "github.com/ketchuphq/ketchup/util/errors" ) var ( diff --git a/server/api/themes.go b/server/api/themes.go index 31a8c67..d11810b 100644 --- a/server/api/themes.go +++ b/server/api/themes.go @@ -7,9 +7,9 @@ import ( "github.com/julienschmidt/httprouter" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/server/router" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/server/router" + "github.com/ketchuphq/ketchup/util/errors" ) func (m *Module) ListThemes(rw http.ResponseWriter, req *http.Request, _ httprouter.Params) error { diff --git a/server/api/user.go b/server/api/user.go index 403fb1e..b81aa74 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -8,10 +8,10 @@ import ( "github.com/julienschmidt/httprouter" "github.com/octavore/nagax/users" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/server/router" - "github.com/octavore/ketchup/server/tls" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/server/router" + "github.com/ketchuphq/ketchup/server/tls" + "github.com/ketchuphq/ketchup/util/errors" ) func (m *Module) GetUser(rw http.ResponseWriter, req *http.Request, par httprouter.Params) error { diff --git a/server/backup/module.go b/server/backup/module.go index 35e621d..bbca744 100644 --- a/server/backup/module.go +++ b/server/backup/module.go @@ -11,8 +11,8 @@ import ( "github.com/octavore/naga/service" "github.com/octavore/nagax/logger" - "github.com/octavore/ketchup/db" - "github.com/octavore/ketchup/server/config" + "github.com/ketchuphq/ketchup/db" + "github.com/ketchuphq/ketchup/server/config" ) type BackupConfig struct { diff --git a/server/content/engines/engine.go b/server/content/engines/engine.go index 463f783..d1a6211 100644 --- a/server/content/engines/engine.go +++ b/server/content/engines/engine.go @@ -4,7 +4,7 @@ import ( "errors" "io" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) // Engines contain maps extensions to template rendering engines diff --git a/server/content/engines/engine_test.go b/server/content/engines/engine_test.go index db67e3c..4618e92 100644 --- a/server/content/engines/engine_test.go +++ b/server/content/engines/engine_test.go @@ -6,7 +6,7 @@ import ( "github.com/golang/protobuf/proto" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) func TestRenderTemplate(t *testing.T) { diff --git a/server/content/module.go b/server/content/module.go index 2fd7755..d10d8d3 100644 --- a/server/content/module.go +++ b/server/content/module.go @@ -7,10 +7,10 @@ import ( "github.com/octavore/naga/service" "github.com/octavore/nagax/logger" - "github.com/octavore/ketchup/db" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/server/content/templates" - "github.com/octavore/ketchup/server/router" + "github.com/ketchuphq/ketchup/db" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/server/content/templates" + "github.com/ketchuphq/ketchup/server/router" ) // Module server is responsible for serving published content diff --git a/server/content/module_test.go b/server/content/module_test.go index 37e408f..9904272 100644 --- a/server/content/module_test.go +++ b/server/content/module_test.go @@ -12,12 +12,12 @@ import ( "github.com/octavore/naga/service" "github.com/octavore/nagax/logger" - "github.com/octavore/ketchup/db" - dummydb "github.com/octavore/ketchup/db/dummy" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/server/content/templates" - dummytmpl "github.com/octavore/ketchup/server/content/templates/dummystore" - "github.com/octavore/ketchup/server/router" + "github.com/ketchuphq/ketchup/db" + dummydb "github.com/ketchuphq/ketchup/db/dummy" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/server/content/templates" + dummytmpl "github.com/ketchuphq/ketchup/server/content/templates/dummystore" + "github.com/ketchuphq/ketchup/server/router" ) var page = &models.Page{ diff --git a/server/content/render.go b/server/content/render.go index 21ba4a7..c249ab0 100644 --- a/server/content/render.go +++ b/server/content/render.go @@ -7,7 +7,7 @@ import ( "github.com/russross/blackfriday" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) func (m *Module) render(w io.Writer, page *models.Page) error { diff --git a/server/content/render_test.go b/server/content/render_test.go index a884262..95d1d5a 100644 --- a/server/content/render_test.go +++ b/server/content/render_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang/protobuf/proto" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) type renderTextContentCase struct { diff --git a/server/content/templates/defaultstore/defaultstore.go b/server/content/templates/defaultstore/defaultstore.go index cda3f52..e175a76 100644 --- a/server/content/templates/defaultstore/defaultstore.go +++ b/server/content/templates/defaultstore/defaultstore.go @@ -5,8 +5,8 @@ import ( "github.com/golang/protobuf/proto" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/server/content/engines" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/server/content/engines" ) var noneTemplate = ` diff --git a/server/content/templates/dummystore/dummy.go b/server/content/templates/dummystore/dummy.go index b5fffd8..ad18093 100644 --- a/server/content/templates/dummystore/dummy.go +++ b/server/content/templates/dummystore/dummy.go @@ -1,6 +1,6 @@ package dummy -import "github.com/octavore/ketchup/proto/ketchup/models" +import "github.com/ketchuphq/ketchup/proto/ketchup/models" type DummyTemplateStore struct { Themes map[string]*models.Theme diff --git a/server/content/templates/filestore/filestore.go b/server/content/templates/filestore/filestore.go index 4f29406..7d0ce84 100644 --- a/server/content/templates/filestore/filestore.go +++ b/server/content/templates/filestore/filestore.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/util/errors" ) const ( diff --git a/server/content/templates/module.go b/server/content/templates/module.go index 48ce0e3..68a9441 100644 --- a/server/content/templates/module.go +++ b/server/content/templates/module.go @@ -6,10 +6,10 @@ import ( "github.com/octavore/naga/service" "github.com/octavore/nagax/logger" - "github.com/octavore/ketchup/plugins/pkg" - "github.com/octavore/ketchup/server/config" - "github.com/octavore/ketchup/server/content/templates/defaultstore" - "github.com/octavore/ketchup/server/content/templates/filestore" + "github.com/ketchuphq/ketchup/plugins/pkg" + "github.com/ketchuphq/ketchup/server/config" + "github.com/ketchuphq/ketchup/server/content/templates/defaultstore" + "github.com/ketchuphq/ketchup/server/content/templates/filestore" ) const ( diff --git a/server/content/templates/registry.go b/server/content/templates/registry.go index 09ea0a5..56ad37f 100644 --- a/server/content/templates/registry.go +++ b/server/content/templates/registry.go @@ -1,6 +1,6 @@ package templates -import "github.com/octavore/ketchup/proto/ketchup/packages" +import "github.com/ketchuphq/ketchup/proto/ketchup/packages" func (m *Module) Registry() (*packages.Registry, error) { err := m.themeRegistry.Sync() diff --git a/server/content/templates/render.go b/server/content/templates/render.go index 3d5e20e..97c464f 100644 --- a/server/content/templates/render.go +++ b/server/content/templates/render.go @@ -3,8 +3,8 @@ package templates import ( "io" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/server/content/engines" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/server/content/engines" ) // Render a page using the theme and template specified therein. diff --git a/server/content/templates/store.go b/server/content/templates/store.go index 17cf960..ef24ccb 100644 --- a/server/content/templates/store.go +++ b/server/content/templates/store.go @@ -1,6 +1,6 @@ package templates -import "github.com/octavore/ketchup/proto/ketchup/models" +import "github.com/ketchuphq/ketchup/proto/ketchup/models" // ThemeStore is a interface to support multiple theme backends. type ThemeStore interface { diff --git a/server/content/templates/templates.go b/server/content/templates/templates.go index 7f2d5fd..e045ae9 100644 --- a/server/content/templates/templates.go +++ b/server/content/templates/templates.go @@ -1,8 +1,8 @@ package templates import ( - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/util/errors" ) // getTemplate returns the desired template. If the theme or template diff --git a/server/content/templates/themes.go b/server/content/templates/themes.go index 1c1c908..8520d9a 100644 --- a/server/content/templates/themes.go +++ b/server/content/templates/themes.go @@ -1,9 +1,9 @@ package templates import ( - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/proto/ketchup/packages" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/packages" + "github.com/ketchuphq/ketchup/util/errors" ) func (m *Module) getTheme(name string) (ThemeStore, *models.Theme, error) { diff --git a/server/router/module.go b/server/router/module.go index 344d530..e519a09 100644 --- a/server/router/module.go +++ b/server/router/module.go @@ -14,9 +14,9 @@ import ( "github.com/octavore/nagax/logger" "github.com/octavore/nagax/router" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/server/router/middleware/gzip" - logger2 "github.com/octavore/ketchup/server/router/middleware/logger" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/server/router/middleware/gzip" + logger2 "github.com/ketchuphq/ketchup/server/router/middleware/logger" ) var ErrNotFound = fmt.Errorf("not found") diff --git a/server/tls/module.go b/server/tls/module.go index 896bc35..08aa732 100644 --- a/server/tls/module.go +++ b/server/tls/module.go @@ -14,9 +14,9 @@ import ( "github.com/octavore/nagax/logger" "github.com/xenolf/lego/acme" - "github.com/octavore/ketchup/server/config" - "github.com/octavore/ketchup/server/router" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/server/config" + "github.com/ketchuphq/ketchup/server/router" + "github.com/ketchuphq/ketchup/util/errors" ) const ( diff --git a/server/tls/store_test.go b/server/tls/store_test.go index d569a2c..1862a77 100644 --- a/server/tls/store_test.go +++ b/server/tls/store_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/octavore/ketchup/server/config" + "github.com/ketchuphq/ketchup/server/config" ) const testDomain = "example.com" diff --git a/server/tls/user.go b/server/tls/user.go index 1ea6585..05d12f6 100644 --- a/server/tls/user.go +++ b/server/tls/user.go @@ -8,7 +8,7 @@ import ( "github.com/octavore/nagax/keystore" "github.com/xenolf/lego/acme" - "github.com/octavore/ketchup/util/errors" + "github.com/ketchuphq/ketchup/util/errors" ) type Registration struct { diff --git a/server/users/module.go b/server/users/module.go index aa63729..bdedc3b 100644 --- a/server/users/module.go +++ b/server/users/module.go @@ -12,8 +12,8 @@ import ( "github.com/octavore/nagax/users/session" "github.com/octavore/nagax/users/tokenauth" - "github.com/octavore/ketchup/db" - "github.com/octavore/ketchup/server/config" + "github.com/ketchuphq/ketchup/db" + "github.com/ketchuphq/ketchup/server/config" ) // Module users is a largely a wrapper around nagax/users/databaseauth diff --git a/server/users/store.go b/server/users/store.go index 739120c..c0a6013 100644 --- a/server/users/store.go +++ b/server/users/store.go @@ -3,8 +3,8 @@ package users import ( "github.com/octavore/nagax/logger" - "github.com/octavore/ketchup/db" - "github.com/octavore/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/db" + "github.com/ketchuphq/ketchup/proto/ketchup/models" ) type userStore struct{ db.Backend } diff --git a/util/gots/main.go b/util/gots/main.go index d78ea67..b7d91cf 100644 --- a/util/gots/main.go +++ b/util/gots/main.go @@ -11,9 +11,9 @@ import ( router_api "github.com/octavore/nagax/proto/nagax/router/api" "github.com/octavore/pbts" - "github.com/octavore/ketchup/proto/ketchup/api" - "github.com/octavore/ketchup/proto/ketchup/models" - "github.com/octavore/ketchup/proto/ketchup/packages" + "github.com/ketchuphq/ketchup/proto/ketchup/api" + "github.com/ketchuphq/ketchup/proto/ketchup/models" + "github.com/ketchuphq/ketchup/proto/ketchup/packages" ) func main() {