aboutsummaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
Diffstat (limited to 'script')
-rwxr-xr-xscript/dev-bucket.sh6
-rwxr-xr-xscript/dev-cluster.sh2
-rwxr-xr-xscript/dev-env.sh13
3 files changed, 10 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-cluster.sh b/script/dev-cluster.sh
index cfe9be0d..9ad4b6b4 100755
--- a/script/dev-cluster.sh
+++ b/script/dev-cluster.sh
@@ -41,6 +41,8 @@ s3_region = "garage" # set this to anything. S3 API calls will fail if they a
[s3_web]
bind_addr = "127.0.0.$count:3902"
+root_domain = ".garage.tld"
+index = "index.html"
EOF
echo -en "$LABEL configuration written to $CONF_PATH\n"
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"