From 29b3dc1127efb2f0a15d6a88a2283dccb806515e Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Sun, 12 Jun 2016 07:14:52 -0700 Subject: [PATCH] added support for colocated vault by default --- cmd/kopia/command_create.go | 14 ++++++++++---- vault/vault.go | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cmd/kopia/command_create.go b/cmd/kopia/command_create.go index 0b5b8c7ef..8471e7420 100644 --- a/cmd/kopia/command_create.go +++ b/cmd/kopia/command_create.go @@ -14,7 +14,7 @@ var ( createCommand = app.Command("create", "Create new vault and repository.") - createCommandRepository = createCommand.Flag("repository", "Repository path.").Required().String() + createCommandRepository = createCommand.Flag("repository", "Repository path.").Default("colocated").String() createObjectFormat = createCommand.Flag("repo-format", "Format of repository objects.").PlaceHolder("FORMAT").Default("sha256-fold160-aes128").Enum(supportedObjectFormats()...) createMaxBlobSize = createCommand.Flag("max-blob-size", "Maximum size of a data chunk.").PlaceHolder("BYTES").Default("20000000").Int() @@ -83,9 +83,15 @@ func runCreateCommand(context *kingpin.ParseContext) error { return fmt.Errorf("unable to get vault storage: %v", err) } - repositoryStorage, err := openStorageAndEnsureEmpty(*createCommandRepository) - if err != nil { - return fmt.Errorf("unable to get repository storage: %v", err) + var repositoryStorage blob.Storage + + if *createCommandRepository == "colocated" { + repositoryStorage = vaultStorage + } else { + repositoryStorage, err = openStorageAndEnsureEmpty(*createCommandRepository) + if err != nil { + return fmt.Errorf("unable to get repository storage: %v", err) + } } repoFormat, err := repositoryFormat() diff --git a/vault/vault.go b/vault/vault.go index 20a2fda82..63b816770 100644 --- a/vault/vault.go +++ b/vault/vault.go @@ -25,7 +25,7 @@ formatBlockID = "format" repositoryConfigBlockID = "repo" - colocatedVaultItemPrefix = "vlt" + colocatedVaultItemPrefix = "VLT" ) var (