Ver Fonte

Merge pull request #24 from crowdsecurity/fix_package_name

Fix package name
erenJag há 5 anos atrás
pai
commit
4bb1e69b40
2 ficheiros alterados com 10 adições e 10 exclusões
  1. 3 3
      cmd/crowdsec/main.go
  2. 7 7
      pkg/csconfig/config.go

+ 3 - 3
cmd/crowdsec/main.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/crowdsecurity/crowdsec/pkg/acquisition"
-	config "github.com/crowdsecurity/crowdsec/pkg/config/crowdsec"
+	"github.com/crowdsecurity/crowdsec/pkg/csconfig"
 	"github.com/crowdsecurity/crowdsec/pkg/cwversion"
 	leaky "github.com/crowdsecurity/crowdsec/pkg/leakybucket"
 	"github.com/crowdsecurity/crowdsec/pkg/outputs"
@@ -33,7 +33,7 @@ var (
 
 	holders []leaky.BucketFactory
 	buckets *leaky.Buckets
-	cConfig *config.Crowdwatch
+	cConfig *csconfig.CrowdSec
 
 	/*settings*/
 	lastProcessedItem time.Time /*keep track of last item timestamp in time-machine. it is used to GC buckets when we dump them.*/
@@ -85,7 +85,7 @@ func main() {
 	inputLineChan := make(chan types.Event)
 	inputEventChan := make(chan types.Event)
 
-	cConfig = config.NewCrowdwatchConfig()
+	cConfig = csconfig.NewCrowdSecConfig()
 
 	// Handle command line arguments
 	if err := cConfig.GetOPT(); err != nil {

+ 7 - 7
pkg/config/crowdsec/config.go → pkg/csconfig/config.go

@@ -1,4 +1,4 @@
-package config
+package csconfig
 
 import (
 	"flag"
@@ -15,8 +15,8 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-// Crowdwatch is the structure of the crowdsec configuration
-type Crowdwatch struct {
+// CrowdSec is the structure of the crowdsec configuration
+type CrowdSec struct {
 	WorkingFolder   string    `yaml:"working_dir,omitempty"`
 	DataFolder      string    `yaml:"data_dir,omitempty"`
 	ConfigFolder    string    `yaml:"config_dir,omitempty"`
@@ -40,9 +40,9 @@ type Crowdwatch struct {
 	OutputConfig    *outputs.OutputFactory `yaml:"plugin"`
 }
 
-// NewCrowdwatchConfig create a new crowdsec configuration with default configuration
-func NewCrowdwatchConfig() *Crowdwatch {
-	return &Crowdwatch{
+// NewCrowdSecConfig create a new crowdsec configuration with default configuration
+func NewCrowdSecConfig() *CrowdSec {
+	return &CrowdSec{
 		LogLevel:      log.InfoLevel,
 		Daemonize:     false,
 		Profiling:     false,
@@ -60,7 +60,7 @@ func NewCrowdwatchConfig() *Crowdwatch {
 }
 
 // GetOPT return flags parsed from command line
-func (c *Crowdwatch) GetOPT() error {
+func (c *CrowdSec) GetOPT() error {
 
 	AcquisitionFile := flag.String("acquis", "", "path to acquis.yaml")
 	configFile := flag.String("c", "", "configuration file")