diff --git a/doc/book/connect/apps/index.md b/doc/book/connect/apps/index.md index 627f1842..2041a981 100644 --- a/doc/book/connect/apps/index.md +++ b/doc/book/connect/apps/index.md @@ -547,7 +547,7 @@ ejabberdctl module_install mod_s3_upload Create the required key and bucket with: ```bash -garage key new --name ejabberd +garage key create ejabberd garage bucket create objects.xmpp-server.fr garage bucket allow objects.xmpp-server.fr --read --write --key ejabberd garage bucket website --allow objects.xmpp-server.fr @@ -678,7 +678,7 @@ For more information on deployment you can check the [ente documentation](https: This is the usual Garage setup: ```bash -garage key new --name pleroma-key +garage key create pleroma-key garage bucket create pleroma garage bucket allow pleroma --read --write --owner --key pleroma-key ``` @@ -759,7 +759,7 @@ This feature requires `pict-rs >= 4.0.0`. This is the usual Garage setup: ```bash -garage key new --name pictrs-key +garage key create pictrs-key garage bucket create pictrs-data garage bucket allow pictrs-data --read --write --key pictrs-key ``` diff --git a/doc/book/connect/backup.md b/doc/book/connect/backup.md index dba6900d..dd3838ca 100644 --- a/doc/book/connect/backup.md +++ b/doc/book/connect/backup.md @@ -22,7 +22,7 @@ Note that `git-annex` requires to be compiled with Haskell package version `aws-0.24` to work with Garage. ```bash -garage key new --name my-key +garage key create my-key garage bucket create my-git-annex garage bucket allow my-git-annex --read --write --key my-key ``` diff --git a/doc/book/connect/observability.md b/doc/book/connect/observability.md index c5037fa4..bef2fc98 100644 --- a/doc/book/connect/observability.md +++ b/doc/book/connect/observability.md @@ -27,7 +27,7 @@ which support storing metrics in an object store: This can be configured with Garage with the following: ```bash -garage key new --name vector-system-logs +garage key create vector-system-logs garage bucket create system-logs garage bucket allow system-logs --read --write --key vector-system-logs ``` diff --git a/script/dev-bucket.sh b/script/dev-bucket.sh index 82e73652..61eb8f4b 100755 --- a/script/dev-bucket.sh +++ b/script/dev-bucket.sh @@ -18,7 +18,7 @@ fi $GARAGE_BIN -c /tmp/config.1.toml bucket create eprouvette if [ "$GARAGE_OLDVER" = "v08" ]; then - KEY_INFO=$($GARAGE_BIN -c /tmp/config.1.toml key new --name opérateur) + KEY_INFO=$($GARAGE_BIN -c /tmp/config.1.toml key create opérateur) ACCESS_KEY=`echo $KEY_INFO|grep -Po 'GK[a-f0-9]+'` SECRET_KEY=`echo $KEY_INFO|grep -Po 'Secret key: [a-f0-9]+'|grep -Po '[a-f0-9]+$'` elif [ "$GARAGE_OLDVER" = "v1" ]; then diff --git a/src/garage/cli/remote/key.rs b/src/garage/cli/remote/key.rs index 68de358f..54d44b78 100644 --- a/src/garage/cli/remote/key.rs +++ b/src/garage/cli/remote/key.rs @@ -226,7 +226,7 @@ impl Cli { pub async fn cmd_import_key(&self, opt: KeyImportOpt) -> Result<(), Error> { if !opt.yes { - return Err(Error::Message("This command is intended to re-import keys that were previously generated by Garage. If you want to create a new key, use `garage key new` instead. Add the --yes flag if you really want to re-import a key.".to_string())); + return Err(Error::Message("This command is intended to re-import keys that were previously generated by Garage. If you want to create a new key, use `garage key create` instead. Add the --yes flag if you really want to re-import a key.".to_string())); } let new_key = self