diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /doc/install/aws/index.md | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'doc/install/aws/index.md')
-rw-r--r-- | doc/install/aws/index.md | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md index 28f04c1a7a7..8a8e3a053b6 100644 --- a/doc/install/aws/index.md +++ b/doc/install/aws/index.md @@ -8,7 +8,7 @@ type: howto # Installing GitLab on Amazon Web Services (AWS) This page offers a walkthrough of a common configuration -for GitLab on AWS. You should customize it to accommodate your needs. +for GitLab on AWS using the official GitLab Linux package. You should customize it to accommodate your needs. NOTE: For organizations with 1,000 users or less, the recommended AWS installation method is to launch an EC2 single box [Omnibus Installation](https://about.gitlab.com/install/) and implement a snapshot strategy for backing up the data. See the [1,000 user reference architecture](../../administration/reference_architectures/1k_users.md) for more. @@ -44,22 +44,21 @@ Below is a diagram of the recommended architecture. ## AWS costs -Here's a list of the AWS services we will use, with links to pricing information: - -- **EC2**: GitLab will deployed on shared hardware which means - [on-demand pricing](https://aws.amazon.com/ec2/pricing/on-demand/) - will apply. If you want to run it on a dedicated or reserved instance, - consult the [EC2 pricing page](https://aws.amazon.com/ec2/pricing/) for more - information on the cost. -- **S3**: We will use S3 to store backups, artifacts, LFS objects, etc. See the - [Amazon S3 pricing](https://aws.amazon.com/s3/pricing/). -- **ELB**: A Classic Load Balancer will be used to route requests to the - GitLab instances. See the [Amazon ELB pricing](https://aws.amazon.com/elasticloadbalancing/pricing/). -- **RDS**: An Amazon Relational Database Service using PostgreSQL will be used. See the - [Amazon RDS pricing](https://aws.amazon.com/rds/postgresql/pricing/). -- **ElastiCache**: An in-memory cache environment will be used to provide a - Redis configuration. See the - [Amazon ElastiCache pricing](https://aws.amazon.com/elasticache/pricing/). +GitLab uses the following AWS services, with links to pricing information: + +- **EC2**: GitLab is deployed on shared hardware, for which + [on-demand pricing](https://aws.amazon.com/ec2/pricing/on-demand/) applies. + If you want to run GitLab on a dedicated or reserved instance, see the + [EC2 pricing page](https://aws.amazon.com/ec2/pricing/) for information about + its cost. +- **S3**: GitLab uses S3 ([pricing page](https://aws.amazon.com/s3/pricing/)) to + store backups, artifacts, and LFS objects. +- **ELB**: A Classic Load Balancer ([pricing page](https://aws.amazon.com/elasticloadbalancing/pricing/)), + used to route requests to the GitLab instances. +- **RDS**: An Amazon Relational Database Service using PostgreSQL + ([pricing page](https://aws.amazon.com/rds/postgresql/pricing/)). +- **ElastiCache**: An in-memory cache environment ([pricing page](https://aws.amazon.com/elasticache/pricing/)), + used to provide a Redis configuration. ## Create an IAM EC2 instance role and profile |