Clean up documentation and remove unnecessary flag

README.md

@@ -100,8 +100,8 @@ s3-endpoint | Custom S3 endpoint. | |
 s3-region | region of the s3 bucket | eu-west-1 | S3_REGION
 s3-no-multipart | disables s3 multipart upload | false | |
 s3-path-style | Forces path style URLs, required for Minio. | false | |
-storj-scope | Scope to use to access the project | | STORJ_SCOPE
-storj-apikey | Bucket to use within the project | | STORJ_BUCKET
+storj-access | Scope to use to access the project | | STORJ_ACCESS
+storj-bucket | Bucket to use within the project | | STORJ_BUCKET
 storj-skip-peer-ca | Skip's CA Peer Check for local environments | false | STORJ_SKIP_PEER_CA
 basedir | path storage for local/gdrive provider| |
 gdrive-client-json-filepath | path to oauth client json config for gdrive provider| |
@@ -162,7 +162,6 @@ To use the Storj Network as storage provider you need to specify the following f
 - provider `--provider storj`
 - storj-scope _(either via flag or environment variable STORJ_SCOPE)_
 - storj-bucket _(either via flag or environment variable STORJ_BUCKET)_
-- storj-skip-peer-ca _(if running against a local test network)_
 
 ### Creating Bucket and Scope
 

cmd/cmd.go

@@ -380,11 +380,11 @@ func New() *Cmd {
 				options = append(options, server.UseStorage(storage))
 			}
 		case "storj":
-			if scope := c.String("storj-scope"); scope == "" {
+			if access := c.String("storj-access"); access == "" {
 				panic("storj-scope not set.")
 			} else if bucket := c.String("storj-bucket"); bucket == "" {
 				panic("storj-bucket not set.")
-			} else if storage, err := server.NewStorjStorage(scope, bucket, c.Bool("storj-skip-peer-ca"), logger); err != nil {
+			} else if storage, err := server.NewStorjStorage(access, bucket, logger); err != nil {
 				panic(err)
 			} else {
 				options = append(options, server.UseStorage(storage))

server/storage.go

@@ -572,7 +572,7 @@ type StorjStorage struct {
 	logger  *log.Logger
 }
 
-func NewStorjStorage(access, bucket string, skipCA bool, logger *log.Logger) (*StorjStorage, error) {
+func NewStorjStorage(access, bucket string, logger *log.Logger) (*StorjStorage, error) {
 	var instance StorjStorage
 	var err error