From bd7e36e98b17857885a45459b7f234777cf081d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= Date: Thu, 13 Jan 2022 09:10:36 +0100 Subject: [PATCH] Rename module --- Makefile | 2 +- cmd/apiary.go | 14 +++++++------- go.mod | 2 +- honeypot/ports/server_test.go | 2 +- honeypot/ssh/server.go | 6 +++--- honeypot/ssh/store/cache.go | 2 +- honeypot/ssh/store/cache_test.go | 2 +- honeypot/ssh/store/memory.go | 2 +- honeypot/ssh/store/memory_test.go | 2 +- honeypot/ssh/store/metrics.go | 2 +- honeypot/ssh/store/postgres.go | 2 +- honeypot/ssh/store/postgres_test.go | 2 +- honeypot/ssh/store/store.go | 2 +- honeypot/ssh/store/store_test.go | 4 ++-- web/server.go | 10 +++++----- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 1eadd99..01a5613 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD) BUILD_DIR = build/binary/current BUILD_OUTPUT = $(BUILD_DIR)/$(NAME)-$(VERSION)-$(OS)-$(ARCH) -BUILD_FLAGS = -tags embed -ldflags "-X github.uio.no/torjus/apiary.Build=$(GIT_COMMIT)" -o $(BUILD_OUTPUT) +BUILD_FLAGS = -tags embed -ldflags "-X git.t-juice.club/torjus/apiary.Build=$(GIT_COMMIT)" -o $(BUILD_OUTPUT) GEODB_URL = https://raw.githubusercontent.com/geoacumen/geoacumen-country/master/Geoacumen-Country.mmdb GEODB_PATH = honeypot/Geoacumen-Country.mmdb diff --git a/cmd/apiary.go b/cmd/apiary.go index 47b609e..fe70e86 100644 --- a/cmd/apiary.go +++ b/cmd/apiary.go @@ -9,16 +9,16 @@ import ( "strings" "time" + "git.t-juice.club/torjus/apiary" + "git.t-juice.club/torjus/apiary/config" + "git.t-juice.club/torjus/apiary/honeypot/ports" + "git.t-juice.club/torjus/apiary/honeypot/smtp" + "git.t-juice.club/torjus/apiary/honeypot/ssh" + "git.t-juice.club/torjus/apiary/honeypot/ssh/store" + "git.t-juice.club/torjus/apiary/web" "github.com/coreos/go-systemd/daemon" sshlib "github.com/gliderlabs/ssh" "github.com/urfave/cli/v2" - "github.uio.no/torjus/apiary" - "github.uio.no/torjus/apiary/config" - "github.uio.no/torjus/apiary/honeypot/ports" - "github.uio.no/torjus/apiary/honeypot/smtp" - "github.uio.no/torjus/apiary/honeypot/ssh" - "github.uio.no/torjus/apiary/honeypot/ssh/store" - "github.uio.no/torjus/apiary/web" "go.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/crypto/acme/autocert" diff --git a/go.mod b/go.mod index ba3156d..bedecb1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.uio.no/torjus/apiary +module git.t-juice.club/torjus/apiary go 1.16 diff --git a/honeypot/ports/server_test.go b/honeypot/ports/server_test.go index 5665dc8..a741c2b 100644 --- a/honeypot/ports/server_test.go +++ b/honeypot/ports/server_test.go @@ -7,7 +7,7 @@ import ( "context" - "github.uio.no/torjus/apiary/honeypot/ports" + "git.t-juice.club/torjus/apiary/honeypot/ports" ) func TestServer(t *testing.T) { diff --git a/honeypot/ssh/server.go b/honeypot/ssh/server.go index 0049c8a..c5e66f0 100644 --- a/honeypot/ssh/server.go +++ b/honeypot/ssh/server.go @@ -10,12 +10,12 @@ import ( gossh "golang.org/x/crypto/ssh" - "github.uio.no/torjus/apiary/config" + "git.t-juice.club/torjus/apiary/config" + "git.t-juice.club/torjus/apiary/honeypot/ssh/store" + "git.t-juice.club/torjus/apiary/models" sshlib "github.com/gliderlabs/ssh" "github.com/google/uuid" - "github.uio.no/torjus/apiary/honeypot/ssh/store" - "github.uio.no/torjus/apiary/models" "go.uber.org/zap" ) diff --git a/honeypot/ssh/store/cache.go b/honeypot/ssh/store/cache.go index 75b02c3..39b6f5d 100644 --- a/honeypot/ssh/store/cache.go +++ b/honeypot/ssh/store/cache.go @@ -1,6 +1,6 @@ package store -import "github.uio.no/torjus/apiary/models" +import "git.t-juice.club/torjus/apiary/models" type CachingStore struct { backend LoginAttemptStore diff --git a/honeypot/ssh/store/cache_test.go b/honeypot/ssh/store/cache_test.go index d8405eb..0b646a4 100644 --- a/honeypot/ssh/store/cache_test.go +++ b/honeypot/ssh/store/cache_test.go @@ -3,7 +3,7 @@ package store_test import ( "testing" - "github.uio.no/torjus/apiary/honeypot/ssh/store" + "git.t-juice.club/torjus/apiary/honeypot/ssh/store" ) func TestCacheStore(t *testing.T) { diff --git a/honeypot/ssh/store/memory.go b/honeypot/ssh/store/memory.go index 20a3cfb..4bae0ed 100644 --- a/honeypot/ssh/store/memory.go +++ b/honeypot/ssh/store/memory.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.uio.no/torjus/apiary/models" + "git.t-juice.club/torjus/apiary/models" ) type MemoryStore struct { diff --git a/honeypot/ssh/store/memory_test.go b/honeypot/ssh/store/memory_test.go index dbb3a50..b50a37e 100644 --- a/honeypot/ssh/store/memory_test.go +++ b/honeypot/ssh/store/memory_test.go @@ -3,7 +3,7 @@ package store_test import ( "testing" - "github.uio.no/torjus/apiary/honeypot/ssh/store" + "git.t-juice.club/torjus/apiary/honeypot/ssh/store" ) func TestMemoryStore(t *testing.T) { diff --git a/honeypot/ssh/store/metrics.go b/honeypot/ssh/store/metrics.go index ac45619..34296f3 100644 --- a/honeypot/ssh/store/metrics.go +++ b/honeypot/ssh/store/metrics.go @@ -4,8 +4,8 @@ import ( "context" "time" + "git.t-juice.club/torjus/apiary/models" "github.com/prometheus/client_golang/prometheus" - "github.uio.no/torjus/apiary/models" ) const tickDuration = 5 * time.Second diff --git a/honeypot/ssh/store/postgres.go b/honeypot/ssh/store/postgres.go index d312780..5fdf30b 100644 --- a/honeypot/ssh/store/postgres.go +++ b/honeypot/ssh/store/postgres.go @@ -5,8 +5,8 @@ import ( "fmt" "net" + "git.t-juice.club/torjus/apiary/models" _ "github.com/jackc/pgx/v4/stdlib" - "github.uio.no/torjus/apiary/models" ) const DBSchema = ` diff --git a/honeypot/ssh/store/postgres_test.go b/honeypot/ssh/store/postgres_test.go index 14880c9..1e30b60 100644 --- a/honeypot/ssh/store/postgres_test.go +++ b/honeypot/ssh/store/postgres_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.uio.no/torjus/apiary/honeypot/ssh/store" + "git.t-juice.club/torjus/apiary/honeypot/ssh/store" ) func TestPostgresStore(t *testing.T) { diff --git a/honeypot/ssh/store/store.go b/honeypot/ssh/store/store.go index 08d61e7..1c091bc 100644 --- a/honeypot/ssh/store/store.go +++ b/honeypot/ssh/store/store.go @@ -3,7 +3,7 @@ package store import ( "errors" - "github.uio.no/torjus/apiary/models" + "git.t-juice.club/torjus/apiary/models" ) var ErrStoreUnhealthy = errors.New("store is unhealthy") diff --git a/honeypot/ssh/store/store_test.go b/honeypot/ssh/store/store_test.go index e990c2f..abf6c9e 100644 --- a/honeypot/ssh/store/store_test.go +++ b/honeypot/ssh/store/store_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + "git.t-juice.club/torjus/apiary/honeypot/ssh/store" + "git.t-juice.club/torjus/apiary/models" "github.com/google/uuid" - "github.uio.no/torjus/apiary/honeypot/ssh/store" - "github.uio.no/torjus/apiary/models" ) func testLoginAttemptStore(s store.LoginAttemptStore, t *testing.T) { diff --git a/web/server.go b/web/server.go index 2d35157..5328e31 100644 --- a/web/server.go +++ b/web/server.go @@ -11,15 +11,15 @@ import ( "sync" "time" + "git.t-juice.club/torjus/apiary" + "git.t-juice.club/torjus/apiary/config" + "git.t-juice.club/torjus/apiary/honeypot/ssh" + "git.t-juice.club/torjus/apiary/honeypot/ssh/store" + "git.t-juice.club/torjus/apiary/models" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.uio.no/torjus/apiary" - "github.uio.no/torjus/apiary/config" - "github.uio.no/torjus/apiary/honeypot/ssh" - "github.uio.no/torjus/apiary/honeypot/ssh/store" - "github.uio.no/torjus/apiary/models" "go.uber.org/zap" "golang.org/x/crypto/acme/autocert" )