Skip to content

Commit

Permalink
Two last modifications for the new region sa-east-1.
Browse files Browse the repository at this point in the history
  • Loading branch information
wikka authored and dadoonet committed May 31, 2013
1 parent 36daeba commit 485bb96
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The plugin will automatically use the instance level security credentials (as of

### Region

The `cloud.aws.region` can be set to a region and will automatically use the relevant settings for both `ec2` and `s3`. The available values are: `us-east` (`us-east-1`), `us-west` (`us-west-1`), `us-west-1`, `us-west-2` `ap-southeast` (`ap-southeast-1`), `ap-southeast-1`, `ap-southeast-2`, `ap-northeast` (`ap-northeast-1`) `eu-west` (`eu-west-1`).
The `cloud.aws.region` can be set to a region and will automatically use the relevant settings for both `ec2` and `s3`. The available values are: `us-east` (`us-east-1`), `us-west` (`us-west-1`), `us-west-1`, `us-west-2` `ap-southeast` (`ap-southeast-1`), `ap-southeast-1`, `ap-southeast-2`, `ap-northeast` (`ap-northeast-1`) `eu-west` (`eu-west-1`), `sa-east` (`sa-east-1`).


## EC2 Discovery
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/elasticsearch/gateway/s3/S3Gateway.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ public S3Gateway(Settings settings, ThreadPool threadPool, ClusterService cluste
region = "EU";
} else if ("eu-west-1".equals(regionSetting.toLowerCase())) {
region = "EU";
} else if ("sa-east".equals(regionSetting.toLowerCase())) {
region = "sa-east-1";
} else if ("sa-east-1".equals(regionSetting.toLowerCase())) {
region = "sa-east-1";
}
}
}
Expand Down

0 comments on commit 485bb96

Please sign in to comment.