diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-11-21 15:44:09 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-21 15:44:09 +0100 |
| commit | 92ab3eedfc03a6cd770e36745373ca188ed9ee20 (patch) | |
| tree | c71d0f1892070549ac9dadfd3cbfec8937b3839b /script | |
| parent | 0f33231ee6154a2b08f67f8107cc686ee9e9c678 (diff) | |
| download | garage-92ab3eedfc03a6cd770e36745373ca188ed9ee20.tar.gz garage-92ab3eedfc03a6cd770e36745373ca188ed9ee20.zip | |
Use awscli instead of s3cmd
Diffstat (limited to 'script')
| -rwxr-xr-x | script/dev-bucket.sh | 6 | ||||
| -rwxr-xr-x | script/dev-env.sh | 13 |
2 files changed, 8 insertions, 11 deletions
diff --git a/script/dev-bucket.sh b/script/dev-bucket.sh index f07263f5..8c0ef4e4 100755 --- a/script/dev-bucket.sh +++ b/script/dev-bucket.sh @@ -6,11 +6,11 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" -garage bucket create éprouvette +garage bucket create eprouvette KEY_INFO=`garage key new --name 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]+$'` -garage bucket allow éprouvette --read --write --key $ACCESS_KEY +garage bucket allow eprouvette --read --write --key $ACCESS_KEY echo "$ACCESS_KEY $SECRET_KEY" > /tmp/garage.s3 -echo "Bucket s3://éprouvette created. Credentials stored in /tmp/garage.s3." +echo "Bucket s3://eprouvette created. Credentials stored in /tmp/garage.s3." diff --git a/script/dev-env.sh b/script/dev-env.sh index 7e8ffc50..61c8618f 100755 --- a/script/dev-env.sh +++ b/script/dev-env.sh @@ -6,13 +6,10 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" -ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1` -SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` +export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1` +export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` +export AWS_DEFAULT_REGION='garage' -alias s3grg="s3cmd \ - --host 127.0.0.1:3900 \ - --access_key=$ACCESS_KEY \ - --secret_key=$SECRET_KEY \ - --region=garage \ - --no-ssl" +alias s3grg="aws s3 \ + --endpoint-url http://127.0.0.1:3900" |