Skip to content

Commit c9cbd0d

Browse files
Fix naming inconsistency (#39)
While distribution packages are probably going to use an explicit name like crowdsec-custom-bouncer, it makes sense to have the Go import path match the location of the Git repository (as that's already done for cs-firewall-bouncer). Co-authored-by: mmetc <[email protected]>
1 parent f500dfa commit c9cbd0d

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

Makefile

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ BUILD_VERSION?="$(shell git describe --tags)"
1515
BUILD_GOVERSION="$(shell go version | cut -d " " -f3 | sed -r 's/[go]+//g')"
1616
BUILD_TIMESTAMP=$(shell date +%F"_"%T)
1717
BUILD_TAG="$(shell git rev-parse HEAD)"
18-
19-
export LD_OPTS=-ldflags "-s -w -X github.com/crowdsecurity/crowdsec-custom-bouncer/pkg/version.Version=$(BUILD_VERSION) \
20-
-X github.com/crowdsecurity/crowdsec-custom-bouncer/pkg/version.BuildDate=$(BUILD_TIMESTAMP) \
21-
-X github.com/crowdsecurity/crowdsec-custom-bouncer/pkg/version.Tag=$(BUILD_TAG) \
22-
-X github.com/crowdsecurity/crowdsec-custom-bouncer/pkg/version.GoVersion=$(BUILD_GOVERSION)"
18+
export LD_OPTS=-ldflags "-s -w -X github.com/crowdsecurity/cs-custom-bouncer/pkg/version.Version=$(BUILD_VERSION) \
19+
-X github.com/crowdsecurity/cs-custom-bouncer/pkg/version.BuildDate=$(BUILD_TIMESTAMP) \
20+
-X github.com/crowdsecurity/cs-custom-bouncer/pkg/version.Tag=$(BUILD_TAG) \
21+
-X github.com/crowdsecurity/cs-custom-bouncer/pkg/version.GoVersion=$(BUILD_GOVERSION)"
2322

2423
RELDIR = "crowdsec-custom-bouncer-${BUILD_VERSION}"
2524

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/crowdsecurity/crowdsec-custom-bouncer
1+
module github.com/crowdsecurity/cs-custom-bouncer
22

33
go 1.19
44

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
log "github.com/sirupsen/logrus"
1919
"github.com/sirupsen/logrus/hooks/writer"
2020

21-
"github.com/crowdsecurity/crowdsec-custom-bouncer/pkg/version"
21+
"github.com/crowdsecurity/cs-custom-bouncer/pkg/version"
2222
csbouncer "github.com/crowdsecurity/go-cs-bouncer"
2323
"gopkg.in/tomb.v2"
2424
)

0 commit comments

Comments
 (0)