Commit 97b36505 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs/avoid-redirected-geo-links' into 'master'

Avoid redirected Geo links

See merge request gitlab-org/gitlab-ce!24138
parents 2800aabb fa9271fb
...@@ -32,7 +32,7 @@ The deployment includes: ...@@ -32,7 +32,7 @@ The deployment includes:
## Limitations ## Limitations
[High Availability](../../administration/high_availability/README.md) and [High Availability](../../administration/high_availability/README.md) and
[Geo](https://docs.gitlab.com/ee/gitlab-geo/README.html) are not supported. [Geo](https://docs.gitlab.com/ee/administration/geo/replication/index.html) are not supported.
## Requirements ## Requirements
......
...@@ -241,7 +241,7 @@ Our free SaaS for public and private repositories. ...@@ -241,7 +241,7 @@ Our free SaaS for public and private repositories.
### GitLab Geo ### GitLab Geo
Allows you to replicate your GitLab instance to other geographical locations as a read-only fully operational version. It [can be used](https://docs.gitlab.com/ee/gitlab-geo/README.html) for cloning and fetching projects, in addition to reading any data. This will make working with large repositories over large distances much faster. Allows you to replicate your GitLab instance to other geographical locations as a read-only fully operational version. It [can be used](https://docs.gitlab.com/ee/administration/geo/replication/index.html) for cloning and fetching projects, in addition to reading any data. This will make working with large repositories over large distances much faster.
### GitLab High Availability ### GitLab High Availability
...@@ -303,7 +303,7 @@ A [tool](https://docs.gitlab.com/ee/integration/external-issue-tracker.html) use ...@@ -303,7 +303,7 @@ A [tool](https://docs.gitlab.com/ee/integration/external-issue-tracker.html) use
### Jenkins ### Jenkins
An Open Source CI tool written using the Java programming language. [Jenkins](https://jenkins.io/) does the same job as GitLab CI, Bamboo, and Travis CI. It is extremely popular. Related [documentation](https://docs.gitlab.com/ee/integration/jenkins.html). An Open Source CI tool written using the Java programming language. [Jenkins](https://jenkins.io/) does the same job as GitLab CI, Bamboo, and Travis CI. It is extremely popular. Related [documentation](https://docs.gitlab.com/ee/integration/jenkins.html).
### Jira ### Jira
...@@ -407,7 +407,7 @@ A free disaster recovery [software](https://help.ubuntu.com/community/MondoMindi ...@@ -407,7 +407,7 @@ A free disaster recovery [software](https://help.ubuntu.com/community/MondoMindi
#### Mount #### Mount
External reference: External reference:
As stated on the [wikipedia page](https://en.wikipedia.org/wiki/Mount_(Unix)), "Mounting makes file systems, files, directories, devices and special files available for use and available to the user." As stated on the [wikipedia page](https://en.wikipedia.org/wiki/Mount_(Unix)), "Mounting makes file systems, files, directories, devices and special files available for use and available to the user."
...@@ -447,7 +447,7 @@ Software for which the original source code is freely [available](https://openso ...@@ -447,7 +447,7 @@ Software for which the original source code is freely [available](https://openso
#### Open Source Stewardship #### Open Source Stewardship
[Related blog post](https://about.gitlab.com/2016/01/11/being-a-good-open-source-steward/). [Related blog post](https://about.gitlab.com/2016/01/11/being-a-good-open-source-steward/).
### Owner ### Owner
...@@ -557,7 +557,7 @@ Software that is hosted centrally and accessed on-demand (i.e. whenever you want ...@@ -557,7 +557,7 @@ Software that is hosted centrally and accessed on-demand (i.e. whenever you want
This term is often used by people when they mean "Version Control." This term is often used by people when they mean "Version Control."
### Scrum ### Scrum
An Agile [framework](https://www.scrum.org/Resources/What-is-Scrum) designed to typically help complete complex software projects. It's made up of several parts: product requirements backlog, sprint planning, sprint (development), sprint review, and retrospec (analyzing the sprint). The goal is to end up with potentially shippable products. An Agile [framework](https://www.scrum.org/Resources/What-is-Scrum) designed to typically help complete complex software projects. It's made up of several parts: product requirements backlog, sprint planning, sprint (development), sprint review, and retrospec (analyzing the sprint). The goal is to end up with potentially shippable products.
...@@ -697,7 +697,7 @@ A [website/system](http://www.wiki.com/) that allows for collaborative editing o ...@@ -697,7 +697,7 @@ A [website/system](http://www.wiki.com/) that allows for collaborative editing o
### Working area ### Working area
Files that have been modified but are not committed. Check them by using the command "git status". Files that have been modified but are not committed. Check them by using the command "git status".
### Working Tree ### Working Tree
......
...@@ -161,7 +161,7 @@ private subnets. ...@@ -161,7 +161,7 @@ private subnets.
Now press the Launch a Cache Cluster and choose Redis for our Now press the Launch a Cache Cluster and choose Redis for our
DB engine. You'll be able to configure details such as replication, DB engine. You'll be able to configure details such as replication,
Multi-AZ and node types. The second section will allow us to choose our Multi-AZ and node types. The second section will allow us to choose our
subnet and security group and subnet and security group and
![Redis Cluster details](img/redis-cluster-det.png) ![Redis Cluster details](img/redis-cluster-det.png)
...@@ -206,7 +206,7 @@ http traffic from anywhere and name it something such as ...@@ -206,7 +206,7 @@ http traffic from anywhere and name it something such as
`gitlab-ec2-security-group`. `gitlab-ec2-security-group`.
While we wait for it to launch we can allocate an Elastic IP and While we wait for it to launch we can allocate an Elastic IP and
associate it with our new EC2 instance. associate it with our new EC2 instance.
### RDS and Redis Security Group ### RDS and Redis Security Group
...@@ -268,8 +268,8 @@ our current case we'll specify the adapter, encoding, host, db name, ...@@ -268,8 +268,8 @@ our current case we'll specify the adapter, encoding, host, db name,
username, and password. username, and password.
gitlab_rails['db_adapter'] = "postgresql" gitlab_rails['db_adapter'] = "postgresql"
gitlab_rails['db_encoding'] = "unicode" gitlab_rails['db_encoding'] = "unicode"
gitlab_rails['db_database'] = "gitlabhq_production" gitlab_rails['db_database'] = "gitlabhq_production"
gitlab_rails['db_username'] = "gitlab" gitlab_rails['db_username'] = "gitlab"
gitlab_rails['db_password'] = "mypassword" gitlab_rails['db_password'] = "mypassword"
gitlab_rails['db_host'] = "<rds-endpoint>" gitlab_rails['db_host'] = "<rds-endpoint>"
...@@ -288,9 +288,9 @@ to make the EFS integration easier to manage. ...@@ -288,9 +288,9 @@ to make the EFS integration easier to manage.
Finally, run reconfigure. You might find it useful to run a check and Finally, run reconfigure. You might find it useful to run a check and
a service status to make sure everything has been set up correctly. a service status to make sure everything has been set up correctly.
sudo gitlab-ctl reconfigure sudo gitlab-ctl reconfigure
sudo gitlab-rake gitlab:check sudo gitlab-rake gitlab:check
sudo gitlab-ctl status sudo gitlab-ctl status
If everything looks good copy the Elastic IP over to your browser and If everything looks good copy the Elastic IP over to your browser and
test the instance manually. test the instance manually.
...@@ -396,4 +396,4 @@ There is a lot of ground yet to cover so have a read through these other ...@@ -396,4 +396,4 @@ There is a lot of ground yet to cover so have a read through these other
resources and feel free to open an issue to request additional material. resources and feel free to open an issue to request additional material.
* [GitLab High Availability](http://docs.gitlab.com/ce/administration/high_availability/README.html#sts=High%20Availability) * [GitLab High Availability](http://docs.gitlab.com/ce/administration/high_availability/README.html#sts=High%20Availability)
* [GitLab Geo](http://docs.gitlab.com/ee/gitlab-geo/README.html) * [GitLab Geo](https://docs.gitlab.com/ee/administration/geo/replication/index.html)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment