diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-06-19 14:10:07 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-06-19 14:11:01 +0100 |
| commit | 8802dd24ecf17fa90b3e0200a05224297fa0f462 (patch) | |
| tree | 1974b45483993690c43ffc7724aa678b700a75a4 /doc/administration | |
| parent | 7754029e190eee6eb530c4c8dc45bec57095d92c (diff) | |
| download | gitlab-ce-8802dd24ecf17fa90b3e0200a05224297fa0f462.tar.gz | |
Update the docs to reflect lack of MySQL support52442-minimal-remove-mysql-support
Now MySQL is no longer supported, we need to change the docs
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/environment_variables.md | 2 | ||||
| -rw-r--r-- | doc/administration/geo/replication/database.md | 4 | ||||
| -rw-r--r-- | doc/administration/index.md | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md index 864a84b33e0..874b1f3c80d 100644 --- a/doc/administration/environment_variables.md +++ b/doc/administration/environment_variables.md @@ -42,7 +42,7 @@ The list of `GITLAB_DATABASE_XXX` variables that you can set is: Variable | Default value | Overridden by `DATABASE_URL`? -------- | ------------- | ----------------------------- -`GITLAB_DATABASE_ADAPTER` | `postgresql` (for MySQL use `mysql2`) | Yes +`GITLAB_DATABASE_ADAPTER` | `postgresql` | Yes `GITLAB_DATABASE_DATABASE` | `gitlab_#{ENV['RAILS_ENV']` | Yes `GITLAB_DATABASE_USERNAME` | `root` | Yes `GITLAB_DATABASE_PASSWORD` | None | Yes diff --git a/doc/administration/geo/replication/database.md b/doc/administration/geo/replication/database.md index 1e5a56c3f4e..6658c37752a 100644 --- a/doc/administration/geo/replication/database.md +++ b/doc/administration/geo/replication/database.md @@ -489,10 +489,6 @@ work: gitlab-ctl reconfigure ``` -## MySQL replication - -MySQL replication is not supported for Geo. - ## Troubleshooting Read the [troubleshooting document](troubleshooting.md). diff --git a/doc/administration/index.md b/doc/administration/index.md index 06d900b152d..602eecb9746 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -33,7 +33,6 @@ Learn how to install, configure, update, and maintain your GitLab instance. - [Install](../install/README.md): Requirements, directory structures, and installation methods. - [Database load balancing](database_load_balancing.md): Distribute database queries among multiple database servers. **[STARTER ONLY]** - - [Omnibus support for external MySQL DB](https://docs.gitlab.com/omnibus/settings/database.html#using-a-mysql-database-management-server-enterprise-edition-only): Omnibus package supports configuring an external MySQL database. **[STARTER ONLY]** - [Omnibus support for log forwarding](https://docs.gitlab.com/omnibus/settings/logs.html#udp-log-shipping-gitlab-enterprise-edition-only) **[STARTER ONLY]** - [High Availability](high_availability/README.md): Configure multiple servers for scaling or high availability. - [Installing GitLab HA on Amazon Web Services (AWS)](../install/aws/index.md): Set up GitLab High Availability on Amazon AWS. |