commit b936d61d179efa49b66966eeae5e0d06b3c23fae · hailey.at/cocoon

+11 -6

cmd/cocoon/main.go

···

       107
       107
        
       				Name:    "s3-backups-enabled",

     

       108
       108
        
       				EnvVars: []string{"COCOON_S3_BACKUPS_ENABLED"},

     

       109
       109
        
       			},

     

       110
       110
       +
       			&cli.BoolFlag{

     

       111
       111
       +
       				Name:    "s3-blobstore-enabled",

     

       112
       112
       +
       				EnvVars: []string{"COCOON_S3_BLOBSTORE_ENABLED"},

     

       113
       113
       +
       			},

     

       110
       114
        
       			&cli.StringFlag{

     

       111
       115
        
       				Name:    "s3-region",

     

       112
       116
        
       				EnvVars: []string{"COCOON_S3_REGION"},

     
···

       181
       185
        
       			SmtpEmail:       cmd.String("smtp-email"),

     

       182
       186
        
       			SmtpName:        cmd.String("smtp-name"),

     

       183
       187
        
       			S3Config: &server.S3Config{

     

       184
       184
       -
       				BackupsEnabled: cmd.Bool("s3-backups-enabled"),

     

       185
       185
       -
       				Region:         cmd.String("s3-region"),

     

       186
       186
       -
       				Bucket:         cmd.String("s3-bucket"),

     

       187
       187
       -
       				Endpoint:       cmd.String("s3-endpoint"),

     

       188
       188
       -
       				AccessKey:      cmd.String("s3-access-key"),

     

       189
       189
       -
       				SecretKey:      cmd.String("s3-secret-key"),

     

       188
       188
       +
       				BackupsEnabled:   cmd.Bool("s3-backups-enabled"),

     

       189
       189
       +
       				BlobstoreEnabled: cmd.Bool("s3-blobstore-enabled"),

     

       190
       190
       +
       				Region:           cmd.String("s3-region"),

     

       191
       191
       +
       				Bucket:           cmd.String("s3-bucket"),

     

       192
       192
       +
       				Endpoint:         cmd.String("s3-endpoint"),

     

       193
       193
       +
       				AccessKey:        cmd.String("s3-access-key"),

     

       194
       194
       +
       				SecretKey:        cmd.String("s3-secret-key"),

     

       190
       195
        
       			},

     

       191
       196
        
       			SessionSecret:     cmd.String("session-secret"),

     

       192
       197
        
       			BlockstoreVariant: server.MustReturnBlockstoreVariant(cmd.String("blockstore-variant")),

+1

models/models.go

···

       106
       106
        
       	Did       string `gorm:"index;index:idx_blob_did_cid"`

     

       107
       107
        
       	Cid       []byte `gorm:"index;index:idx_blob_did_cid"`

     

       108
       108
        
       	RefCount  int

     

       109
       109
       +
       	Storage   string `gorm:"default:sqlite;check:storage in ('sqlite', 's3')"`

     

       109
       110
        
       }

     

       110
       111
        
       

     

       111
       112
        
       type BlobPart struct {

+7 -6

server/server.go

···

       52
       52
        
       )

     

       53
       53
        
       

     

       54
       54
        
       type S3Config struct {

     

       55
       55
       -
       	BackupsEnabled bool

     

       56
       56
       -
       	Endpoint       string

     

       57
       57
       -
       	Region         string

     

       58
       58
       -
       	Bucket         string

     

       59
       59
       -
       	AccessKey      string

     

       60
       60
       -
       	SecretKey      string

     

       55
       55
       +
       	BackupsEnabled   bool

     

       56
       56
       +
       	BlobstoreEnabled bool

     

       57
       57
       +
       	Endpoint         string

     

       58
       58
       +
       	Region           string

     

       59
       59
       +
       	Bucket           string

     

       60
       60
       +
       	AccessKey        string

     

       61
       61
       +
       	SecretKey        string

     

       61
       62
        
       }

     

       62
       63
        
       

     

       63
       64
        
       type Server struct {