summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /doc/install
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/aws/index.md2
-rw-r--r--doc/install/azure/index.md8
-rw-r--r--doc/install/docker.md13
-rw-r--r--doc/install/installation.md2
-rw-r--r--doc/install/postgresql_extensions.md2
-rw-r--r--doc/install/requirements.md6
6 files changed, 24 insertions, 9 deletions
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 5abc4bd3122..ca024f685f1 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -277,7 +277,7 @@ On the Route 53 dashboard, click **Hosted zones** in the left navigation bar:
1. Click **Create**.
1. If you registered your domain through Route 53, you're done. If you used a different domain registrar, you need to update your DNS records with your domain registrar. You'll need to:
1. Click on **Hosted zones** and select the domain you added above.
- 1. You'll see a list of `NS` records. From your domain registrar's admin panel, add each of these as `NS` records to your domain's DNS records. These steps may vary between domain registrars. If you're stuck, Google **"name of your registrar" add DNS records** and you should find a help article specific to your domain registrar.
+ 1. You'll see a list of `NS` records. From your domain registrar's administrator panel, add each of these as `NS` records to your domain's DNS records. These steps may vary between domain registrars. If you're stuck, Google **"name of your registrar" add DNS records** and you should find a help article specific to your domain registrar.
The steps for doing this vary depending on which registrar you use and is beyond the scope of this guide.
diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md
index 9d9d06b2206..38d423fbcdf 100644
--- a/doc/install/azure/index.md
+++ b/doc/install/azure/index.md
@@ -214,6 +214,14 @@ To set up the GitLab external URL:
sudo gitlab-ctl reconfigure
```
+1. To prevent the domain name from
+ [resetting after a reboot](https://docs.bitnami.com/aws/apps/gitlab/configuration/change-default-address/),
+ rename the utility that Bitnami uses:
+
+ ```shell
+ sudo mv /opt/bitnami/apps/gitlab/bnconfig /opt/bitnami/apps/gitlab/bnconfig.bak
+ ```
+
You can now visit GitLab with your browser at the new external URL.
### Visit GitLab for the first time
diff --git a/doc/install/docker.md b/doc/install/docker.md
index a6bc18bd374..7be97a1f2e6 100644
--- a/doc/install/docker.md
+++ b/doc/install/docker.md
@@ -119,9 +119,16 @@ sudo docker logs -f gitlab
After starting a container you can visit `gitlab.example.com` (or
`http://192.168.59.103` if you used boot2docker on macOS). It might take a while
before the Docker container starts to respond to queries.
-The very first time you visit GitLab, you will be asked to set up the admin
-password. After you change it, you can log in with username `root` and the
-password you set up.
+
+Visit the GitLab URL, and log in with username `root`
+and the password from the following command:
+
+```shell
+sudo docker exec -it gitlab grep 'Password:' /etc/gitlab/initial_root_password
+```
+
+NOTE:
+The password file will be automatically deleted in the first reconfigure run after 24 hours.
### Install GitLab using Docker Compose
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 9db8631a6a5..a0587c6ef8a 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -40,7 +40,7 @@ can't be terminated and its memory usage grows over time.
## Select a version to install
-Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install (e.g., `11-7-stable`).
+Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install (for example, `11-7-stable`).
You can select the branch in the version dropdown in the top left corner of GitLab (below the menu bar).
If the highest number stable branch is unclear, check the [GitLab blog](https://about.gitlab.com/blog/) for installation guide links by version.
diff --git a/doc/install/postgresql_extensions.md b/doc/install/postgresql_extensions.md
index 99c85f4f808..8d1cf9afc5c 100644
--- a/doc/install/postgresql_extensions.md
+++ b/doc/install/postgresql_extensions.md
@@ -17,7 +17,7 @@ You must load the following extensions into the main GitLab database (defaults t
| `btree_gist` | 13.1 |
| `plpgsql` | 11.7 |
-If you are using [GitLab Geo](https://about.gitlab.com/solutions/geo/), you must load the following
+If you are using [GitLab Geo](https://about.gitlab.com/solutions/geo/), you must load the following
extensions into all secondary tracking databases (defaults to `gitlabhq_geo_production`):
| Extension | Minimum GitLab version |
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 71d00e3f688..ba515de417f 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -296,10 +296,10 @@ The GitLab Runner server requirements depend on:
Since the nature of the jobs varies for each use case, you need to experiment by adjusting the job concurrency to get the optimum setting.
-For reference, GitLab.com's [auto-scaling shared runner](../user/gitlab_com/index.md#shared-runners) is configured so that a **single job** runs in a **single instance** with:
+For reference, the GitLab.com Build Cloud [auto-scaling runner for Linux](../ci/runners/build_cloud/linux_build_cloud.md) is configured so that a **single job** runs in a **single instance** with:
-- 1vCPU.
-- 3.75GB of RAM.
+- 1 vCPU.
+- 3.75 GB of RAM.
## Supported web browsers