Quality of life improvements

.gitignore

@@ -1,2 +1,6 @@
 /build.sh
 /deploy.sh
+kuri
+ritool
+gwcfg
+settings.env

Makefile

@@ -0,0 +1,11 @@
+all: kuboribs gwcfg
+
+kuboribs:
+	go build -o kuri ./integrations/kuri/cmd/kuri
+.PHONY: kuboribs
+
+gwcfg:
+	go build -o gwcfg ./integrations/gwcfg/main.go
+.PHONY: gwcfg
+clean:
+	rm -f kuri gwcfg

configuration/config.go

@@ -16,25 +16,34 @@ var log = logging.Logger("ribs:config")
 type LocalwebConfig struct {
 	Path string `envconfig:"EXTERNAL_LOCALWEB_PATH"`
 	Url  string `envconfig:"EXTERNAL_LOCALWEB_URL"`
+
+	BuiltinServer bool   `envconfig:"EXTERNAL_LOCALWEB_BUILTIN_SERVER" default:"true"`
+	ServerPort string `envconfig:"EXTERNAL_LOCALWEB_SERVER_PORT" default:"8443"`
+	ServerTLS  bool   `envconfig:"EXTERNAL_LOCALWEB_SERVER_TLS" default:"true"`
+
+	MaxConcurrentUploadsPerDeal int `envconfig:"EXTERNAL_LOCALWEB_MAX_CONCURRENT_UPLOADS_PER_DEAL" default:"15"`
+}
+
+type S3Config struct {
+	Endpoint  string `envconfig:"EXTERNAL_S3_ENDPOINT"`
+	Region    string `envconfig:"EXTERNAL_S3_REGION"`
+	AccessKey string `envconfig:"EXTERNAL_S3_ACCESS_KEY"`
+	SecretKey string `envconfig:"EXTERNAL_S3_SECRET_KEY"`
+	Token     string `envconfig:"EXTERNAL_S3_TOKEN"`
+	Bucket    string `envconfig:"EXTERNAL_S3_BUCKET"`
+	BucketUrl string `envconfig:"EXTERNAL_S3_BUCKET_URL"`
 }
 
 type ExternalConfig struct {
 	Localweb LocalwebConfig
+	S3       S3Config
 }
 
-type S3Config struct {
-	Endpoint  string `envconfig:"S3_ENDPOINT"`
-	Region    string `envconfig:"S3_REGION"`
-	AccessKey string `envconfig:"S3_ACCESS_KEY"`
-	SecretKey string `envconfig:"S3_SECRET_KEY"`
-	Token     string `envconfig:"S3_TOKEN"`
-	Bucket    string `envconfig:"S3_BUCKET"`
-	BucketUrl string `envconfig:"S3_BUCKET_URL"`
-}
+
 type CidGravityConfig struct {
 	ApiToken                string            `envconfig:"CIDGRAVITY_API_TOKEN"`
 	ApiEndpointGetProviders string            `envconfig:"CIDGRAVITY_API_ENDPOINT_GBAP" default:"https://service.cidgravity.com/private/v1/get-best-available-providers"`
-	ApiEndpointGetDeals     string            `envconfig:"CIDGRAVITY_API_ENDPOINT_GBAP" default:"https://service.cidgravity.com/private/v1/get-on-chain-deals"`
+	ApiEndpointGetDeals     string            `envconfig:"CIDGRAVITY_API_ENDPOINT_GOCD" default:"https://service.cidgravity.com/private/v1/get-on-chain-deals"`
 	MaxConns                int64             `envconfig:"CIDGRAVITY_MAX_CONNECTIONS" default:"4"`
 	AltClients              []string          `envconfig:"CIDGRAVITY_ALT_CLIENTS"`
 	AltTokens               map[string]string
@@ -51,7 +60,7 @@ type RibsConfig struct {
 	DealCheckInterval          time.Duration `envconfig:"RIBS_DEAL_CHECK_INTERVAL" default:"30s"`
 	DealCanSendCommand         string        `envconfig:"RIBS_DEAL_CAN_SEND_COMMAND" default:""`
 	MongoDBUri                 string        `envconfig:"RIBS_MONGODB_URI"`
-	RunSpCrawler               bool          `envconfig:"RIBS_RUN_SP_CRAWLER" default:false`
+	RunSpCrawler               bool          `envconfig:"RIBS_RUN_SP_CRAWLER" default:"true"`
 }
 type DealConfig struct {
 	StartTime          uint `envconfig:"RIBS_DEAL_START_TIME" default:"96"` // hours
@@ -66,8 +75,6 @@ type WalletConfig struct {
 }
 
 type Config struct {
-	Loaded     bool
-	S3         S3Config
 	External   ExternalConfig
 	CidGravity CidGravityConfig
 	Ribs       RibsConfig
@@ -79,15 +86,13 @@ type Config struct {
 var config Config
 
 func GetConfig() *Config {
-	if !config.Loaded {
-		err := LoadConfig()
-		if err != nil {
-			panic(err)
-		}
-	}
 	return &config
 }
 
+func init() {
+	LoadConfig()
+}
+
 func LoadConfig() error {
 	// neew to initialize those types so they are not nil
 	config.Wallet.MinMarketBalance = types.NewInt(0)
@@ -140,7 +145,6 @@ func LoadConfig() error {
 		}
 	}
 
-	config.Loaded = true
 	log.Debugw("Loaded config", "config", config)
 	return nil
 }