+11 -6

cmd/cocoon/main.go

··· 107 Name: "s3-backups-enabled", 108 EnvVars: []string{"COCOON_S3_BACKUPS_ENABLED"}, 109 }, 0 0 0 0 110 &cli.StringFlag{ 111 Name: "s3-region", 112 EnvVars: []string{"COCOON_S3_REGION"}, ··· 181 SmtpEmail: cmd.String("smtp-email"), 182 SmtpName: cmd.String("smtp-name"), 183 S3Config: &server.S3Config{ 184 - BackupsEnabled: cmd.Bool("s3-backups-enabled"), 185 - Region: cmd.String("s3-region"), 186 - Bucket: cmd.String("s3-bucket"), 187 - Endpoint: cmd.String("s3-endpoint"), 188 - AccessKey: cmd.String("s3-access-key"), 189 - SecretKey: cmd.String("s3-secret-key"), 0 190 }, 191 SessionSecret: cmd.String("session-secret"), 192 BlockstoreVariant: server.MustReturnBlockstoreVariant(cmd.String("blockstore-variant")),

··· 107 Name: "s3-backups-enabled", 108 EnvVars: []string{"COCOON_S3_BACKUPS_ENABLED"}, 109 }, 110 + &cli.BoolFlag{ 111 + Name: "s3-blobstore-enabled", 112 + EnvVars: []string{"COCOON_S3_BLOBSTORE_ENABLED"}, 113 + }, 114 &cli.StringFlag{ 115 Name: "s3-region", 116 EnvVars: []string{"COCOON_S3_REGION"}, ··· 185 SmtpEmail: cmd.String("smtp-email"), 186 SmtpName: cmd.String("smtp-name"), 187 S3Config: &server.S3Config{ 188 + BackupsEnabled: cmd.Bool("s3-backups-enabled"), 189 + BlobstoreEnabled: cmd.Bool("s3-blobstore-enabled"), 190 + Region: cmd.String("s3-region"), 191 + Bucket: cmd.String("s3-bucket"), 192 + Endpoint: cmd.String("s3-endpoint"), 193 + AccessKey: cmd.String("s3-access-key"), 194 + SecretKey: cmd.String("s3-secret-key"), 195 }, 196 SessionSecret: cmd.String("session-secret"), 197 BlockstoreVariant: server.MustReturnBlockstoreVariant(cmd.String("blockstore-variant")),

+1

models/models.go

··· 106 Did string `gorm:"index;index:idx_blob_did_cid"` 107 Cid []byte `gorm:"index;index:idx_blob_did_cid"` 108 RefCount int 0 109 } 110 111 type BlobPart struct {

··· 106 Did string `gorm:"index;index:idx_blob_did_cid"` 107 Cid []byte `gorm:"index;index:idx_blob_did_cid"` 108 RefCount int 109 + Storage string `gorm:"default:sqlite;check:storage in ('sqlite', 's3')"` 110 } 111 112 type BlobPart struct {

+7 -6

server/server.go

··· 52 ) 53 54 type S3Config struct { 55 - BackupsEnabled bool 56 - Endpoint string 57 - Region string 58 - Bucket string 59 - AccessKey string 60 - SecretKey string 0 61 } 62 63 type Server struct {

··· 52 ) 53 54 type S3Config struct { 55 + BackupsEnabled bool 56 + BlobstoreEnabled bool 57 + Endpoint string 58 + Region string 59 + Bucket string 60 + AccessKey string 61 + SecretKey string 62 } 63 64 type Server struct {