diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/dev-cluster.sh | 2 | ||||
| -rw-r--r-- | script/dev-env-s3cmd.sh | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh index 101a18bd..64c17cfc 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 = "[::]:$((3920+$count))" +root_domain = ".garage.tld" +index = "index.html" EOF echo -en "$LABEL configuration written to $CONF_PATH\n" diff --git a/script/dev-env-s3cmd.sh b/script/dev-env-s3cmd.sh index 88d2941f..15f08e2e 100644 --- a/script/dev-env-s3cmd.sh +++ b/script/dev-env-s3cmd.sh @@ -6,14 +6,9 @@ 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` - -alias s3grg="s3cmd \ - --host 127.0.0.1:3911 \ - --host-bucket 127.0.0.1:3911 \ - --access_key=$ACCESS_KEY \ - --secret_key=$SECRET_KEY \ - --region=garage \ - --no-ssl" +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="aws s3 \ + --endpoint-url http://127.0.0.1:3911" |