diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-11-29 17:40:03 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-29 17:40:03 +0100 |
| commit | a512db342e71f13c51fbf1c15914e5ad3051c798 (patch) | |
| tree | c1505c9888b971325facc6d3b7cac3cbb2ce68dd | |
| parent | 54c3a023f0febb68824be51a9b35a2457373ad07 (diff) | |
| parent | 2f11191f607eb70b608358576303d7e94e757038 (diff) | |
| download | garage-a512db342e71f13c51fbf1c15914e5ad3051c798.tar.gz garage-a512db342e71f13c51fbf1c15914e5ad3051c798.zip | |
Merge branch 'master' into feature/website
| -rwxr-xr-x | script/dev-cluster.sh | 12 | ||||
| -rwxr-xr-x | script/dev-env.sh | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh index 9ad4b6b4..64c17cfc 100755 --- a/script/dev-cluster.sh +++ b/script/dev-cluster.sh @@ -24,11 +24,11 @@ cat > $CONF_PATH <<EOF block_size = 1048576 # objects are split in blocks of maximum this number of bytes metadata_dir = "/tmp/garage-meta-$count" data_dir = "/tmp/garage-data-$count" -rpc_bind_addr = "127.0.0.$count:3901" # the port other Garage nodes will use to talk to this node +rpc_bind_addr = "[::]:$((3900+$count))" # the port other Garage nodes will use to talk to this node bootstrap_peers = [ - "127.0.0.1:3901", - "127.0.0.2:3901", - "127.0.0.3:3901" + "[::1]:3901", + "[::1]:3902", + "[::1]:3903" ] max_concurrent_rpc_requests = 12 data_replication_factor = 3 @@ -36,11 +36,11 @@ meta_replication_factor = 3 meta_epidemic_fanout = 3 [s3_api] -api_bind_addr = "127.0.0.$count:3900" # the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part. +api_bind_addr = "[::]:$((3910+$count))" # the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part. s3_region = "garage" # set this to anything. S3 API calls will fail if they are not made against the region set here. [s3_web] -bind_addr = "127.0.0.$count:3902" +bind_addr = "[::]:$((3920+$count))" root_domain = ".garage.tld" index = "index.html" EOF diff --git a/script/dev-env.sh b/script/dev-env.sh index a2829c73..71fbd208 100755 --- a/script/dev-env.sh +++ b/script/dev-env.sh @@ -6,9 +6,10 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" +<<<<<<< HEAD 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:3900" + --endpoint-url http://127.0.0.1:3911" |