diff --git a/docs/admin/auth/saml/microsoft-adfs.mdx b/docs/admin/auth/saml/microsoft-adfs.mdx index 1cf58a34e..3d790b80f 100644 --- a/docs/admin/auth/saml/microsoft-adfs.mdx +++ b/docs/admin/auth/saml/microsoft-adfs.mdx @@ -12,7 +12,7 @@ These instructions guide you through configuring Sourcegraph as a relying party - Active Directory instance where all users have email and username attributes. - An instance of ADFS running on Windows Server, joined to your Active Directory domain. -- Sourcegraph should be [configured to use HTTPS](/self-hosted/http-https-configuration#nginx-sslhttps-configuration). +- Sourcegraph should be [configured to use HTTPS](/self-hosted/http-https-configuration). - Ensure that `externalURL` in [advanced configuration](/admin/config/site-config) meets the following criteria: - It is the URL used by end users (no trailing slash). @@ -114,9 +114,8 @@ All configuration is now complete. Let's test that it works. ## Troubleshooting -When troubleshooting, we recommend setting the env var `INSECURE_SAML_LOG_TRACES=1` on the -`sourcegraph/server` Docker container (or the `sourcegraph-frontend` pod if Sourcegraph is deployed -to a Kubernetes cluster). This logs all SAML requests and responses. +When troubleshooting, we recommend [setting the env var `INSECURE_SAML_LOG_TRACES=1`](/admin/auth/saml#enable-logging-in-sourcegraph-containers) +on the `sourcegraph-frontend` deployment. This logs all SAML requests and responses. ### Add Relying Party Trust fails on Select Data Source page diff --git a/docs/admin/code-hosts/other.mdx b/docs/admin/code-hosts/other.mdx index a5a661a10..f68d07036 100644 --- a/docs/admin/code-hosts/other.mdx +++ b/docs/admin/code-hosts/other.mdx @@ -24,15 +24,15 @@ If your code host serves git repositories over SSH, make sure your Sourcegraph i docker exec $CONTAINER ssh -p $PORT $USER@$HOSTNAME ``` -- $CONTAINER is the name or ID of your sourcegraph/server container +- $CONTAINER is the name or ID of your `gitserver` container - $PORT is the port on which your code host's git server is listening for connections - $USER is your user on your code host -- $HOSTNAME is the hostname of your code host from within the sourcegraph/server container (e.g. `githost.example.com`) +- $HOSTNAME is the hostname of your code host from within the `gitserver` container (e.g. `githost.example.com`) Here's an example: ``` -docker exec sourcegraph ssh -p 29418 admin@githost.example.com +docker exec gitserver-0 ssh -p 29418 admin@githost.example.com ``` The `url` field is then diff --git a/docs/admin/config/site-config.mdx b/docs/admin/config/site-config.mdx index ed881e7b6..a59f4535a 100644 --- a/docs/admin/config/site-config.mdx +++ b/docs/admin/config/site-config.mdx @@ -1240,7 +1240,7 @@ All advanced configuration options and their default values are shown below. If you are having trouble accessing the web UI, you can make edits to your advanced configuration by editing the configuration directly. -### Sourcegraph with Docker Compose and single-server Sourcegraph with Docker +### Sourcegraph with Docker Compose Set `FRONTEND_CONTAINER` to: diff --git a/docs/admin/how-to/site-admin-quickstart.mdx b/docs/admin/how-to/site-admin-quickstart.mdx index 856bdc22c..5d3577322 100644 --- a/docs/admin/how-to/site-admin-quickstart.mdx +++ b/docs/admin/how-to/site-admin-quickstart.mdx @@ -22,7 +22,7 @@ We support a number of other deployment types which are described in the [Deploy ### Self-hosted vs. Managed instances -Regardless of the deployment option you choose, Sourcegraph can be self-hosted locally or with the cloud provider of your choice. We also offer [managed instances](/cloud/) (we handle deployment, updates, and management of the instance for you). Please [contact us](https://about.sourcegraph.com/contact/sales) if you are interested in learning more about managed instances. +Regardless of the deployment option you choose, Sourcegraph can be self-hosted locally or with the cloud provider of your choice. We also offer [managed instances](/cloud/) (we handle deployment, updates, and management of the instance for you). Please [contact us](https://sourcegraph.com/contact) if you are interested in learning more about managed instances. ## Updating your instance diff --git a/docs/admin/pings.mdx b/docs/admin/pings.mdx index 63a761b47..04c3ded56 100644 --- a/docs/admin/pings.mdx +++ b/docs/admin/pings.mdx @@ -18,7 +18,7 @@ Sourcegraph aggregates usage and performance metrics for some product features i - The IP address of the instance (e.g. "172.xx.xx.xx") - Sourcegraph version string (e.g. "vX.X.X") - Dependency versions (e.g. "6.0.9" for Redis, or "13.0" for Postgres) -- Deployment type (single Docker image, Docker Compose, Kubernetes cluster, Helm) +- Deployment type (Docker Compose, Kubernetes cluster, Helm) - License key associated with your Sourcegraph Enterprise subscription - Aggregate count of current monthly users - Total count of existing user accounts diff --git a/docs/admin/subscriptions.mdx b/docs/admin/subscriptions.mdx index ac3d1fd5b..fbdcf9410 100644 --- a/docs/admin/subscriptions.mdx +++ b/docs/admin/subscriptions.mdx @@ -4,7 +4,7 @@ Organizations using Sourcegraph can [upgrade to Sourcegraph Enterprise](https://about.sourcegraph.com/pricing) to get the features that large organizations need (single sign-on, backups and recovery, cluster deployment, access to code navigation and intelligence, etc.). These additional features in Sourcegraph Enterprise are paid and not open source. -You can [contact Sourcegraph](https://about.sourcegraph.com/contact/sales) to purchase a license. This entitles you to a license key (provided immediately after your purchase), which activates Enterprise features on your Sourcegraph instance. +You can [contact Sourcegraph](https://sourcegraph.com/contact) to purchase a license. This entitles you to a license key (provided immediately after your purchase), which activates Enterprise features on your Sourcegraph instance. ## Volume discounts @@ -12,7 +12,7 @@ You can [contact Sourcegraph](https://about.sourcegraph.com/contact/sales) to pu ## Pricing model -[Sourcegraph's pricing](https://about.sourcegraph.com/pricing) is based primarily on [total active user accounts](#how-user-accounts-are-counted). In certain situations, it is also a combination of the [number of lines of code indexed](#how-lines-of-code-are-counted). Please [contact Sourcegraph](https://about.sourcegraph.com/contact/sales) to answer specific questions about our pricing model for your use. +[Sourcegraph's pricing](https://about.sourcegraph.com/pricing) is based primarily on [total active user accounts](#how-user-accounts-are-counted). In certain situations, it is also a combination of the [number of lines of code indexed](#how-lines-of-code-are-counted). Please [contact Sourcegraph](https://sourcegraph.com/contact) to answer specific questions about our pricing model for your use. ## How user accounts are counted diff --git a/docs/cloud/index.mdx b/docs/cloud/index.mdx index 69d90bdaa..3f0529da2 100644 --- a/docs/cloud/index.mdx +++ b/docs/cloud/index.mdx @@ -21,7 +21,7 @@ Sourcegraph provisions each instance in an isolated and secure cloud environment Use the button above to sign up for a free trial of Sourcegraph Cloud. When you request a trial, you will receive an email indicating the status of your request. If eligible for a cloud instance, you will receive a link to the instance URL once it's provisioned. This normally takes less than one hour during business hours. From there, we recommend using the [onboarding checklist](/getting-started/cloud-instance) to set up your instance quickly. -Please [contact us](https://sourcegraph.com/contact/sales) if you have specific VPN requirements or you require a large deployment with >500 users, >1,000 repos, or monorepos >5 GB. +Please [contact us](https://sourcegraph.com/contact) if you have specific VPN requirements or you require a large deployment with >500 users, >1,000 repos, or monorepos >5 GB. ## Cloud subscription @@ -219,7 +219,7 @@ For all managed instances, we will provide security capabilities from Cloudflare Your instance will be hosted in isolated Google Cloud infrastructure. See our [FAQ](#faq) below to learn more about the cloud architecture. Both your team and limited Sourcegraph personnel will have application-level administrator access to the instance. -Only essential Sourcegraph personnel will have access to the instance, server, code, and any other sensitive materials, such as tokens or keys. The employees or contractors with access are bound by the same terms as Sourcegraph itself. Learn more in our [security policies for Sourcegraph Cloud](https://about.sourcegraph.com/security) or [contact us](https://about.sourcegraph.com/contact/sales) with any questions or concerns. You may also request copies of our SOC 2 Type II Report and ISO 27001 certificate on our [security portal](https://security.sourcegraph.com). +Only essential Sourcegraph personnel will have access to the instance, server, code, and any other sensitive materials, such as tokens or keys. The employees or contractors with access are bound by the same terms as Sourcegraph itself. Learn more in our [security policies for Sourcegraph Cloud](https://about.sourcegraph.com/security) or [contact us](https://sourcegraph.com/contact) with any questions or concerns. You may also request copies of our SOC 2 Type II Report and ISO 27001 certificate on our [security portal](https://security.sourcegraph.com). ### Sourcegraph management access @@ -229,7 +229,7 @@ All Sourcegraph Cloud instances have Sourcegraph management access enabled by de ## Accommodating special requirements -We may be able to support special requests (network access policies, infrastructure requirements, custom version control systems, etc.) with additional time, support, and fees. [Contact us](https://about.sourcegraph.com/contact/sales) to discuss any special requirements you may have. +We may be able to support special requests (network access policies, infrastructure requirements, custom version control systems, etc.) with additional time, support, and fees. [Contact us](https://sourcegraph.com/contact) to discuss any special requirements you may have. ## FAQ diff --git a/docs/code-insights/explanations/current-limitations-of-code-insights.mdx b/docs/code-insights/explanations/current-limitations-of-code-insights.mdx index c800293bc..1e919f741 100644 --- a/docs/code-insights/explanations/current-limitations-of-code-insights.mdx +++ b/docs/code-insights/explanations/current-limitations-of-code-insights.mdx @@ -58,8 +58,6 @@ In this case, you may want to try: ## General scale limitations -Code Insights is disabled by default on single-docker deployment methods. - There are a few factors to consider with respect to scale and expected performance. 1. General permissiveness - instances that are more open (users can see most repos) will perform better than instances that are more restricted. Insights have been tested with users having up to 100k restricted repositories. diff --git a/docs/self-hosted/deploy/docker-compose/migrate.mdx b/docs/self-hosted/deploy/docker-compose/migrate.mdx deleted file mode 100644 index a3f006517..000000000 --- a/docs/self-hosted/deploy/docker-compose/migrate.mdx +++ /dev/null @@ -1,227 +0,0 @@ -# Migrate from the single Docker image to Docker Compose - -The single-container (`sourcegraph/server`) deployment mode has been **removed in [Sourcegraph 7.0.0](https://sourcegraph.com/changelog/releases/7.0)**. The `sourcegraph/server` Docker image is no longer published starting with 7.0.0. You **must** migrate to Docker Compose or Kubernetes before upgrading to 7.0.0. - -Deploying via Docker Compose is the recommended method for production deployments as it provides resource isolation between Sourcegraph services which makes it more scalable and stable. This page describes how to migrate from a single Docker image deployment to the Docker Compose deployment method. - -Sourcegraph's core data (including user accounts, configuration, repository-metadata, etc.), can be migrated from the single Docker image (`sourcegraph/server`) to the Docker Compose deployment by dumping and restoring the Postgres database. - -## Notes before you begin - -### Version requirements - -- Use the docker-compose version corresponding to your _current Sourcegraph version._ Do NOT attempt to upgrade at the same time as migrating to docker-compose. -- For example, if the Sourcegraph instance `sourcegraph/server` image is version `v3.19.2` you must follow this guide using the Docker Compose deployment version `v3.19.2`. That means you must migrate to a new instance that is on _the same version you took the Database dump from._ - -### Storage location change - -After migration, Sourcegraph's data will be stored in Docker volumes instead of `~/.sourcegraph/`. For more information, see the cloud-provider documentation referred to in ["Create the new Docker Compose instance"](#create-the-new-docker-compose-instance). - -### Only core data will be migrated - -The migration will bring over core data including user accounts, configuration, repository-metadata, etc. Other data will be regenerated automatically: - -- Repositories will be re-cloned -- Search indexes will be rebuilt from scratch - -The above may take awhile if you have a lot of repositories. In the meantime, searches may be slow or return incomplete results. Usually this process will not take longer than 6 hours. - -### Monthly-usage based pricing - -If you are on a monthly-based usage pricing model, please check first with your Sourcegraph point of contact before continuing with these migration steps. - -## Migration guide - -If you wish to automate the migration process, a script has been provided in the [deploy-sourcegraph-docker repository](https://github.com/sourcegraph/deploy-sourcegraph-docker/blob/v6.12.5040/tools/migrate.sh) which will backup and migrate your single server database to a docker-compose deployment. - -To manually migrate use the steps outlined below. - -### Backup single Docker image database - -#### Find single Docker image's `CONTAINER_ID` - -- `ssh` from your local machine into the instance hosting the `sourcegraph/server` container -- Run the following command to find the `sourcegraph/server`'s `CONTAINER_ID`: - -```bash -> docker ps -CONTAINER ID IMAGE -... sourcegraph/server -``` - -#### Generate database dump - -- Dump Postgres database to `/tmp/db.out` - -```bash -# Use the CONTAINER_ID found in the previous step -docker exec -it "$CONTAINER_ID" sh -c 'pg_dump -C --clean --if-exists --username=postgres sourcegraph' > /tmp/sourcegraph_db.out - -docker exec -it "$CONTAINER_ID" sh -c 'pg_dump -C --clean --if-exists --username=postgres sourcegraph-codeintel' > /tmp/codeintel_db.out -``` - -- Copy Postgres dump from the `sourcegraph/server` container to the host machine - -```bash -docker cp "$CONTAINER_ID":/tmp/*_db.out /tmp/ -``` - -#### Copy database dump to your local machine - -- End your `ssh` session with the `sourcegraph/server` host machine - -- Copy the Postgres dump from the `sourcegraph/server` host to your local machine: - -```bash -# Modify this command with your authentication information -scp example_user@example_docker_host.com:/tmp/*.out -``` - -- Run `less "/tmp/sourcegraph_db.out"` and `less "/tmp/codeintel_db.out"` and verify that the database dump has contents that you expect (e.g. that some of your repository names appear) - -### Create the new Docker Compose instance - -Follow your cloud provider's installation guide to create the new Docker Compose instance: - -- [Deploy Sourcegraph with Docker Compose on AWS](/self-hosted/deploy/docker-compose/aws) -- [Deploy Sourcegraph with Docker Compose on Google Cloud](/self-hosted/deploy/docker-compose/google-cloud) -- [Deploy Sourcegraph with Docker Compose on DigitalOcean](/self-hosted/deploy/docker-compose/digitalocean) - -Once you have finished the above, come back here for directions on how to copy over the database from your old `sourcegraph/server` instance. - -### Restore database backup to the Docker Compose instance - -#### Prepare the Postgres instance - -- `ssh` from your local machine into the new instance running the Docker Compose deployment - -- Navigate to the directory containing the Docker Compose definition: - -```bash -# Refer to the script in your cloud provider's installation guide -# to find the value for "DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT" - -cd "$DEPLOY_SOURCEGRAPH_DOCKER_CHECKOUT"/docker-compose -``` - -- Tear down the existing Docker Compose containers (and associated volumes) so that we avoid conflicting transactions while modifying the database - -```bash - docker-compose down --volumes -``` - -- Start the Postgres instance on its own - -```bash -docker-compose -f db-only-migrate.docker-compose.yaml up -d -``` - -- End your `ssh` session with the new Docker Compose deployment host - -#### Apply database dump to Postgres instance - -- Copy the Postgres dump from your local machine to the Docker Compose host: - -```bash -# Modify this command with your authentication information -scp *db.out example_user@example_docker_compose_host.com:/tmp/ -``` - -- `ssh` from your local machine into the Docker Compose deployment host - -- Copy database dump from the Docker Compose host to the Postgres container - -```bash -docker cp /tmp/sourcegraph_db.out pgsql:/tmp/ -docker cp /tmp/codeintel_db.out codeintel-db:/tmp/ -``` - -- Create a shell session inside the pgsql container - -```bash -docker exec -it pgsql /bin/sh -``` - -- Restore the database dump - -```bash -psql --username=sg -f /tmp/sourcegraph_db.out postgres -``` - -- Open up a psql session inside the Postgres container - -```bash -psql --username=sg postgres -``` - -- Apply the following tweaks to transform the single Docker image's database schema into Docker Compose's - -```postgres -DROP DATABASE sg; -ALTER DATABASE sourcegraph RENAME TO sg; -ALTER DATABASE sg OWNER TO sg; -``` - -- End your `psql` session - -```bash -\q -``` - -- End your Postgres container shell session - -```bash -exit -``` - -- Create a shell session inside the codeintel-db container - -```bash -docker exec -it codeintel-db /bin/sh -``` - -- Restore the database dump - -```bash -psql --username=sg -f /tmp/codeintel_db.out postgres -``` - -- Open up a psql session inside the Postgres container - -```bash -psql --username=sg postgres -``` - -- Apply the following tweaks to transform the single Docker image's database schema into Docker Compose's - -```postgres -DROP DATABASE sg; -ALTER DATABASE "sourcegraph-codeintel" RENAME TO sg; -ALTER DATABASE sg OWNER TO sg; -``` - -- End your `psql` session - -```bash -\q -``` - -- End your Postgres container shell session - -```bash -exit -``` - -#### Start the rest of the Sourcegraph containers - -```bash -docker-compose -f docker-compose.yaml up -d -``` - -## Conclusion - -The migration process is now complete. - -You should be able to log into your instance and verify that previous users and configuration are still present. Repositories may take awhile to clone and index, but their names should be immediately visible in the Administration repositories list. Wait for repositories to clone and verify the new Sourcegraph instance works as expected. - -After verifying the new instance is functional, you can tear down the old `sourcegraph/server` single Docker container Sourcegraph instance. diff --git a/docs/self-hosted/deploy/migrate-backup.mdx b/docs/self-hosted/deploy/migrate-backup.mdx index 658fc0516..bfecb93eb 100644 --- a/docs/self-hosted/deploy/migrate-backup.mdx +++ b/docs/self-hosted/deploy/migrate-backup.mdx @@ -2,10 +2,6 @@ In some circumstances it may be necessary or advantageous to migrate from one Sourcegraph instance or deployment to another. This page describes how to execute such a migration. -## Specific guides - -- [Migrate from the single Docker image to Docker Compose](/self-hosted/deploy/docker-compose/migrate) - ## Data stores While much of Sourcegraph's data can be regenerated, some state can be stored in multiple locations. @@ -77,12 +73,12 @@ The easiest option is to simply back up or migrate [configuration JSON data](#co This option provides a more complete backup, and ensures that almost all state will be restored. Repositories will have to be re-cloned and re-indexed, so some downtime will be required while these operations complete. -Follow the instructions in our [Docker to Docker Compose migration guide](/self-hosted/deploy/docker-compose/migrate#backup-single-docker-image-database) to generate a dump of Sourcegraph's Postgres database. [Contact us](https://about.sourcegraph.com/contact/sales) for specific recommendations for your deployment type. +Follow the backup and restore instructions for [Docker Compose](/self-hosted/deploy/docker-compose/operations#backup-and-restore) or [Kubernetes](/self-hosted/deploy/kubernetes/operations#backup-and-restore) to generate a dump of Sourcegraph's Postgres databases. [Contact us](https://sourcegraph.com/contact) for specific recommendations for your deployment type. ### Option 3: All data Backing up all persistent volumes is the most complete option. Instructions for doing this depends on the deployment -method and the cloud host. [Contact us](https://about.sourcegraph.com/contact/sales) to discuss more. +method and the cloud host. [Contact us](https://sourcegraph.com/contact) to discuss more. ## Persistent data backup in Kubernetes diff --git a/docs/self-hosted/deploy/without-service-discovery.mdx b/docs/self-hosted/deploy/without-service-discovery.mdx index 1b4724ff9..bc581a16c 100644 --- a/docs/self-hosted/deploy/without-service-discovery.mdx +++ b/docs/self-hosted/deploy/without-service-discovery.mdx @@ -5,7 +5,7 @@ when running without service discovery. -If you are deploying Sourcegraph in an environment **without Kubernetes service discovery** (for example, using Docker Compose or single-container Docker), you must manually configure the frontend service to know about the other service replicas. This is typically required when you are not using RBAC, or when running outside Kubernetes entirely. +If you are deploying Sourcegraph in an environment **without Kubernetes service discovery** (for example, using Docker Compose), you must manually configure the frontend service to know about the other service replicas. This is typically required when you are not using RBAC, or when running outside Kubernetes entirely. ## Required Environment Variables diff --git a/docs/self-hosted/deployment-best-practices.mdx b/docs/self-hosted/deployment-best-practices.mdx index d978adfb0..08632e4e2 100644 --- a/docs/self-hosted/deployment-best-practices.mdx +++ b/docs/self-hosted/deployment-best-practices.mdx @@ -35,18 +35,6 @@ _Unless scale, resiliency, or some other legitimate need exists that necessitate - Be sure your deployment meets our [Docker Compose requirements](/self-hosted/deploy/docker-compose/#requirements). - Review the [configuration section](/self-hosted/deploy/docker-compose/#configuration) of our [Docker Compose deployment docs](/self-hosted/deploy/docker-compose/). -### Sourcegraph Server (single Docker container) - -Sourcegraph Server is best used for trying out Sourcegraph. It's not intended for enterprise production deployments for the following reasons: - -- Limited logging information for debugging -- Performance issues with: - - more than 100 repositories - - more than 10 active users -- Some Sourcegraph features do not have full functionality (Ex: Code Insights) - -_It is possible to migrate your data to a Docker-Compose or Kubernetes deployment, contact your Customer Engineer or reach out to support and we'll be happy to assist you in upgrading your deployment._ - ## Additional support information ### Precise code navigation and Batch Changes diff --git a/docs/self-hosted/external-services/index.mdx b/docs/self-hosted/external-services/index.mdx index 180141684..b32bcc465 100644 --- a/docs/self-hosted/external-services/index.mdx +++ b/docs/self-hosted/external-services/index.mdx @@ -23,7 +23,7 @@ See the following guides to use an external or managed version of each service t - See [Using a managed object storage service (S3 or GCS)](/self-hosted/external-services/object-storage) to replace the bundled blobstore instance. - See [Using an external Jaeger instance](/self-hosted/observability/tracing#Use-an-external-Jaeger-instance) to replace the bundled Jaeger instance. -> NOTE: Using Sourcegraph with an external service is a [paid feature](https://about.sourcegraph.com/pricing). [Contact us](https://about.sourcegraph.com/contact/sales) to get a trial license. +> NOTE: Using Sourcegraph with an external service is a [paid feature](https://about.sourcegraph.com/pricing). [Contact us](https://sourcegraph.com/contact) to get a trial license. ## Cloud alternatives diff --git a/docs/self-hosted/external-services/object-storage.mdx b/docs/self-hosted/external-services/object-storage.mdx index b577a3b77..3b9e4ca3d 100644 --- a/docs/self-hosted/external-services/object-storage.mdx +++ b/docs/self-hosted/external-services/object-storage.mdx @@ -98,8 +98,7 @@ To target a managed object storage service for storing [code graph index uploads we recommend using one bucket. -- If you are running a `sourcegraph/server` deployment, set the environment variables on the server container -- If you are running via Docker-compose or Kubernetes, set the environment variables on the `frontend`, `worker`, and `precise-code-intel-worker` containers +Set the environment variables on the `frontend`, `worker`, and `precise-code-intel-worker` containers. ### Using S3 for the Code Graph Indexes bucket @@ -171,8 +170,7 @@ To target a third party managed object storage service for storing [Search Job r we recommend using one bucket. -- If you are running a `sourcegraph/server` deployment, set the environment variables on the server container -- If you are running via Docker-compose or Kubernetes, set the environment variables on the `frontend` and `worker` containers +Set the environment variables on the `frontend` and `worker` containers. ### Using S3 for the Search Job results bucket diff --git a/docs/self-hosted/external-services/postgres.mdx b/docs/self-hosted/external-services/postgres.mdx index 3736ac318..6340ef665 100644 --- a/docs/self-hosted/external-services/postgres.mdx +++ b/docs/self-hosted/external-services/postgres.mdx @@ -49,25 +49,6 @@ To externalize the _code navigation database_, use the following prefixed `CODEI on the same host. -### sourcegraph/server - -Add the following to your `docker run` command: - -```shell -docker run [...] --e PGHOST=psql1.example.com --e PGUSER=sourcegraph --e PGPASSWORD=secret --e PGDATABASE=sourcegraph --e PGSSLMODE=require --e CODEINTEL_PGHOST=psql2.example.com --e CODEINTEL_PGUSER=sourcegraph --e CODEINTEL_PGPASSWORD=secret --e CODEINTEL_PGDATABASE=sourcegraph-codeintel --e CODEINTEL_PGSSLMODE=require -sourcegraph/server:{CURRENT_VERSION_NO_V} -``` - ### Docker Compose 1. Add/modify the following environment variables to all of the `sourcegraph-frontend-*` services, the `sourcegraph-frontend-internal` service, and the `migrator` service (for Sourcegraph versions 3.37+) in [docker-compose.yaml](https://github.com/sourcegraph/deploy-sourcegraph-docker/blob/3.37/docker-compose/docker-compose.yaml): @@ -171,18 +152,6 @@ Configure the following environment variables for the **`sourcegraph-frontend`** When [PgBouncer] is used, we need to include `statement_cache_mode=describe` in the PostgreSQL connection url. This can be done by configuring the `PGDATASOURCE` and `CODEINSIGHTS_PGDATASOURCE` environment variables to `postgres://username:password@pgbouncer.example.com:5432/sg?statement_cache_mode=describe` -### sourcegraph/server - -Add the following to your `docker run` command: - -
-	
-		docker run [...] -e PGDATASOURCE="postgres://username:password@sourcegraph-pgbouncer.example.com:5432/sg?statement_cache_mode=describe"
-		 -e CODEINSIGHTS_PGDATASOURCE="postgres://username:password@sourcegraph-codeintel-pgbouncer.example.com:5432/sg?statement_cache_mode=describe"
-		 sourcegraph/server:
-	
-
- ### Docker Compose 1. Add/modify the following environment variables to all of the `sourcegraph-frontend-*` services, the `sourcegraph-frontend-internal` service, and the `migrator` service (for Sourcegraph versions 3.37+) in [docker-compose.yaml](https://github.com/sourcegraph/deploy-sourcegraph-docker/blob/3.37/docker-compose/docker-compose.yaml): diff --git a/docs/self-hosted/how-to/rebuild-corrupt-postgres-indexes.mdx b/docs/self-hosted/how-to/rebuild-corrupt-postgres-indexes.mdx index d89573dc3..521646e55 100644 --- a/docs/self-hosted/how-to/rebuild-corrupt-postgres-indexes.mdx +++ b/docs/self-hosted/how-to/rebuild-corrupt-postgres-indexes.mdx @@ -50,21 +50,6 @@ Then we rebuild the database indexes. reindex (verbose) database sg; ``` -In docker, you can fix the indexes while the server is running. It is not required to stop the single server image. -The only risk here is that connections and every other process might be slow. - -Using the following commands you can re-index the database: - -```sql -reindex (verbose) system sourcegraph; -``` - -Then we rebuild the database indexes. - -```sql -reindex (verbose) database sourcegraph; -``` - If any duplicate errors are reported, we must delete some rows by adapting and running the [duplicate deletion query](#duplicate-deletion-query) for each of the errors found. After deleting duplicates, just re-run the above statement. Repeat the process until there are no errors. diff --git a/docs/self-hosted/how-to/run-psql.mdx b/docs/self-hosted/how-to/run-psql.mdx index f5c2827ba..64a5a8b6f 100644 --- a/docs/self-hosted/how-to/run-psql.mdx +++ b/docs/self-hosted/how-to/run-psql.mdx @@ -13,10 +13,3 @@ This document will take you through how to run postgres queries in the main data ## Docker Compose 1. Exec into the database to run Postgres queries using `docker container exec -it pgsql psql -U sg` - -## Single-container - -1. Find the Sourcegraph-Container-ID in which your Sourcegraph instance is running using the following command: `docker ps -a` -1. Run the following command to exec into the container: `docker exec -it Sourcegraph-Container-ID bash` -1. Start postgres to run postgres queries: `psql -U postgres` -1. There is no Password for the database by default, so you can just hit enter when it asks for your password diff --git a/docs/self-hosted/http-https-configuration.mdx b/docs/self-hosted/http-https-configuration.mdx index e512ac6e1..697efcba7 100644 --- a/docs/self-hosted/http-https-configuration.mdx +++ b/docs/self-hosted/http-https-configuration.mdx @@ -2,158 +2,13 @@ Overview: -- [Single Docker image (`sourcegraph/server`): NGINX](#sourcegraph-single-instance-docker) -- [Sourcegraph Cluster (Kubernetes): NGINX](#sourcegraph-cluster-kubernetes) +- [Sourcegraph Cluster (Kubernetes): NGINX](#sourcegraph-cluster-kubernetes-nginx) - [Docker Compose: Caddy 2](#sourcegraph-via-docker-compose-caddy-2) -## Sourcegraph single Docker image and Sourcegraph Cluster (Kubernetes): NGINX - -Sourcegraph's single Docker image and Kubernetes deployments use [NGINX](https://www.nginx.com/resources/glossary/nginx/) as a [reverse proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) for the Sourcegraph front-end server, meaning NGINX proxies external HTTP (and [HTTPS](#nginx-sslhttps-configuration)) requests to the Sourcegraph front-end. - -![NGINX and Sourcegraph architecture](https://storage.googleapis.com/sourcegraph-assets/Docs/sourcegraph-nginx.svg) - -**Note**: Non-sighted users can view a [text-representation of this diagram](/self-hosted/sourcegraph-nginx-mermaid). - -### Sourcegraph single instance (Docker) - -The first time Sourcegraph is run, it will create an [`nginx.conf`](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/cmd/server/shared/assets/nginx.conf) file at: - -- `~/.sourcegraph/config/nginx.conf` on the Docker/Sourcegraph host (presuming you're using the [quickstart `docker run` command](/#quick-install)) -- `/etc/sourcegraph/nginx.conf` inside the container - -SSL support requires two things: - -1. [Manual editing](#nginx-sslhttps-configuration) of the NGINX configuration file if using the [quickstart docker run command](/self-hosted/deploy) as it presumes local or internal usage. -1. (Now that NGINX is listening on port 7443), we need to configure the Sourcegraph container to forward - 443 to 7443 by adding `--publish 443:7443` to the `docker run` command: - -```bash -docker container run \ - --rm \ - --publish 7080:7080 \ - --publish 127.0.0.1:3370:3370 \ - --publish 443:7443 \ - \ - --volume ~/.sourcegraph/config:/etc/sourcegraph \ - --volume ~/.sourcegraph/data:/var/opt/sourcegraph \ - sourcegraph/server:{CURRENT_VERSION_NO_V} -``` - -### Sourcegraph Cluster (Kubernetes) +## Sourcegraph Cluster (Kubernetes): NGINX We use the [ingress-nginx](https://kubernetes.github.io/ingress-nginx/) for Sourcegraph Cluster running on Kubernetes. Refer to the [deploy-sourcegraph Configuration](/self-hosted/deploy/kubernetes/configure#network-access) documentation for more information. -### NGINX SSL/HTTPS configuration - -#### If you have a valid SSL certificate - -**1.** Copy your SSL certificate and key to `~/.sourcegraph/config` (where the `nginx.conf` file is). - -**2.** Edit `nginx.conf` so that port `7080` redirects to `7443` and `7443` is served with SSL. It should look like this: - -```nginx -... -http { - ... - server { - listen 7080; - return 301 https://$host:7443$request_uri; - } - - server { - # Do not remove. The contents of sourcegraph_server.conf can change - # between versions and may include improvements to the configuration. - include nginx/sourcegraph_server.conf; - - listen 7443 ssl; - server_name sourcegraph.example.com; # change to your URL - ssl_certificate sourcegraph.crt; - ssl_certificate_key sourcegraph.key; - - location / { - ... - } - } -} -``` - -#### If you need an SSL certificate - -There are a few options: - -**[1. Generate a browser-trusted certificate using Let's Encrypt (Certbot)](https://certbot.eff.org/)**
- -1. On the Certbot homepage, select "Nginx" and the operating system of the machine hosting Sourcegraph. -1. Follow the instructions to install and run Certbot. -1. If there is currently a process (e.g., Sourcegraph) listening on port 80, you'll - need to stop it before running Certbot: - - ``` - docker stop $(docker ps | grep sourcegraph/server | awk '{ print $1 }') - ``` - -1. When you get to the step describing how to run Certbot, use the "certonly" command: `sudo certbot certonly --nginx`. -1. When Certbot runs successfully, it will emit the key file `privkey.pem` and cert file - `fullchain.pem`. These should be renamed to `sourcegraph.key` and `sourcegraph.crt`, - respectively, if you are using the `nginx.conf` template mentioned in this doc. -1. Kill the NGINX server that Certbot started: `killall nginx`. Restart Sourcegraph: - - ``` - docker start $(docker ps -a | grep sourcegraph/server | awk '{ print $1 }') - ``` - -1. Now visit your Sourcegraph instance at `https://sourcegraph.example.com`. If there are issues, debug by examining the Docker logs: - - ``` - docker logs $(docker ps | grep sourcegraph/server | awk '{ print $1 }') - ``` - -**[2. Generate a self-signed certificate](/self-hosted/ssl-https-self-signed-cert-nginx)**
- -_This step can be skipped if you already have a certificate from a [globally trusted Certificate Authority (CA) provider](https://en.wikipedia.org/wiki/Certificate_authority#Providers)._ - -**3. Use your CDN's HTTPS proxy feature**
- -Some CDNs such as -[Cloudflare](https://support.cloudflare.com/hc/en-us/articles/200170416-End-to-end-HTTPS-with-Cloudflare-Part-3-SSL-options) -can handle the HTTPS connection from the user's browser while allowing the underlying service to -continue serving HTTP (or HTTPS with a self-signed certificate). View your CDN's documentation for -more details. - -### Redirect to external HTTPS URL - -The URL that clients should use to access Sourcegraph is defined in the `externalURL` property in [advanced configuration](/admin/config/site-config). To enforce that clients access Sourcegraph via this URL (and not some other URL, such as an IP address or other non-`https` URL), add the following to `nginx.conf` (replacing `https://sourcegraph.example.com` with your external URL): - -```nginx -# Redirect non-HTTPS traffic to HTTPS. -server { - listen 80; - server_name _; - - location / { - return 301 https://sourcegraph.example.com$request_uri; - } -} -``` - -### HTTP Strict Transport Security - -[HTTP Strict Transport Security](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) instructs web clients to only communicate with the server over HTTPS. To configure it, add the following to `nginx.conf` (in the `server` block): - -```nginx -add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; -``` - -See [`add_header` documentation](https://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header) and "[Configuring HSTS in nginx](https://www.nginx.com/blog/http-strict-transport-security-hsts-and-nginx/)" for more details. - -### Additional NGINX SSL configuration - -See the [NGINX SSL Termination](https://docs.nginx.com/nginx/admin-guide/security-controls/terminating-ssl-http/) guide and [Configuring HTTPS Servers](https://nginx.org/en/docs/http/configuring_https_servers.html). - -### Next steps - -You should configure Sourcegraph's `externalURL` in the [advanced configuration](/admin/config/site-config) (and restart the frontend instances) so that Sourcegraph knows its URL. - ## Sourcegraph via Docker Compose: Caddy 2 Sourcegraph's [Docker Compose deployment](/self-hosted/deploy/docker-compose/) uses [Caddy 2](https://caddyserver.com/) as its reverse proxy. The Docker Compose deployment ships with a few builtin templates that cover common scenarios for exposing Sourcegraph: @@ -204,4 +59,6 @@ In your [docker-compose.yaml](https://github.com/sourcegraph/deploy-sourcegraph- **NOTE**: When adding your certs to your instance, make sure they are in the `deploy-sourcegraph-docker` folder, not outside of it. They will not be recognized otherwise. +## Next steps +You should configure Sourcegraph's `externalURL` in the [advanced configuration](/admin/config/site-config) (and restart the frontend instances) so that Sourcegraph knows its URL. diff --git a/docs/self-hosted/index.mdx b/docs/self-hosted/index.mdx index eb26313f3..abb846d17 100644 --- a/docs/self-hosted/index.mdx +++ b/docs/self-hosted/index.mdx @@ -41,7 +41,6 @@ Get started running Sourcegraph on-prem. - For general admin tasks, see [Sourcegraph Admin](/admin) - [HTTP and HTTPS/SSL configuration](/self-hosted/http-https-configuration) - - [Adding SSL (HTTPS) to Sourcegraph with a self-signed certificate](/self-hosted/ssl-https-self-signed-cert-nginx) - [Setting the URL for your instance](/self-hosted/url) - [Configure email sending / SMTP server](/self-hosted/email) - [Scaling workers](/self-hosted/workers) diff --git a/docs/self-hosted/observability/alerts.mdx b/docs/self-hosted/observability/alerts.mdx index f54bebb6a..ddd83eb09 100644 --- a/docs/self-hosted/observability/alerts.mdx +++ b/docs/self-hosted/observability/alerts.mdx @@ -1431,7 +1431,6 @@ Generated query for critical alert: `min(((src_gitserver_disk_space_available / **Next steps** -- **Single container deployments (removed in 7.0.0):** The single-container deployment mode has been sunset. [Migrate to Docker Compose](/self-hosted/deploy/docker-compose/migrate). - **Kubernetes and Docker Compose:** Check that you are running a similar number of git server replicas and that their CPU/memory limits are allocated according to what is shown in the [Sourcegraph resource estimator](/self-hosted/deploy/resource-estimator). - If your persistent volume is slow, you may want to provision more IOPS, usually by increasing the volume size. - More help interpreting this metric is available in the [dashboards reference](/self-hosted/observability/dashboards#gitserver-echo_command_duration_test). diff --git a/docs/self-hosted/observability/metrics.mdx b/docs/self-hosted/observability/metrics.mdx index f11e2f2d8..cac6f88eb 100644 --- a/docs/self-hosted/observability/metrics.mdx +++ b/docs/self-hosted/observability/metrics.mdx @@ -196,8 +196,7 @@ If you are using the [Kubernetes deployment option](/self-hosted/deploy/kubernet kubectl port-forward svc/prometheus 9090:30090 ``` -If you are using the [Docker Compose deployment option](/self-hosted/deploy/), you will need to restart the Sourcegraph container -with a flag `--publish 9090:9090` in the `docker run` command. +If you are using the [Docker Compose deployment option](/self-hosted/deploy/docker-compose/), Prometheus is already published on port 9090 of the Docker host. Prometheus will be available http://localhost:9090. diff --git a/docs/self-hosted/postgres-conf.mdx b/docs/self-hosted/postgres-conf.mdx index d334c15ac..84af1b976 100644 --- a/docs/self-hosted/postgres-conf.mdx +++ b/docs/self-hosted/postgres-conf.mdx @@ -4,8 +4,6 @@ Sourcegraph Kubernetes cluster administrators can override the default PostgreSQ For [Docker Compose](/self-hosted/deploy/docker-compose/) deployment, administrators can also override the default PostgreSQL configuration by modifying the external configuration files at [pgsql/conf/postgresql.conf], [codeintel-db/conf/postgresql.conf], and [codeinsights-db/conf/postgresql.conf]. These files are mounted to the Postgres server during runtime (NOTE: This is only available in versions 3.39 and later). -There is no officially supported way of customizing the PostgreSQL configuration in the single Docker image. - ## Suggested configuration ### Static configuration diff --git a/docs/self-hosted/postgres.mdx b/docs/self-hosted/postgres.mdx index 42280ce8b..50ca7f549 100644 --- a/docs/self-hosted/postgres.mdx +++ b/docs/self-hosted/postgres.mdx @@ -113,13 +113,3 @@ When running an [external PostgreSQL instance](/self-hosted/external-services/po 4. Turn Sourcegraph back on connecting to the now-upgraded database. > WARNING: **Do not allow Sourcegraph to run/connect to the new Postgres database until it has been fully populated with your data.** Doing so could result in Sourcegraph trying to create e.g. a new DB schema and partially migrating. If this happens to you, restore from the backup you previously took or contact us (support@sourcegraph.com) - -#### Single-container Sourcegraph (removed in 7.0.0) - -The single-container (`sourcegraph/server`) deployment mode has been removed in [Sourcegraph 7.0.0](https://sourcegraph.com/changelog/releases/7.0). [Migrate to Docker Compose](/self-hosted/deploy/docker-compose/migrate) or [Kubernetes](/self-hosted/deploy/kubernetes/). - - -The single-container deployment (`sourcegraph/server`) is sunset in [Sourcegraph 7.0.0](https://sourcegraph.com/changelog/releases/7.0) and is no longer supported. Admins using single-container deployments should migrate to a supported deployment type such as [Docker Compose](/self-hosted/deploy/docker-compose/) or [Kubernetes](/self-hosted/deploy/kubernetes/) before upgrading to 7.0.0. - - -For versions prior to 7.0.0, single-container deployments do not support automatic PostgreSQL upgrades. Admins with production data in a single-container deployment are advised to reach out to support@sourcegraph.com for assistance. diff --git a/docs/self-hosted/sourcegraph-nginx-mermaid.mdx b/docs/self-hosted/sourcegraph-nginx-mermaid.mdx deleted file mode 100644 index 84e8c335d..000000000 --- a/docs/self-hosted/sourcegraph-nginx-mermaid.mdx +++ /dev/null @@ -1,14 +0,0 @@ -# NGINX and Sourcegraph diagram - -```mermaid -graph LR - -A(Browser/Client) -B(NGINX) -C(Sourcegraph front-end) - -A-->|HTTP request: 80|B -A-->|HTTPS request :443|B -A-->|HTTP request: 7080|B -B-->|HTTP request: 7080|C -``` diff --git a/docs/self-hosted/ssl-https-self-signed-cert-nginx.mdx b/docs/self-hosted/ssl-https-self-signed-cert-nginx.mdx deleted file mode 100644 index fa4b30c17..000000000 --- a/docs/self-hosted/ssl-https-self-signed-cert-nginx.mdx +++ /dev/null @@ -1,150 +0,0 @@ -# Adding SSL (HTTPS) to Sourcegraph with a self-signed certificate - -This is for external Sourcegraph instances that need a self-signed certificate because they don't yet have a certificate from a [globally trusted Certificate Authority (CA)](https://en.wikipedia.org/wiki/Certificate_authority#Providers). It includes how to get the self-signed certificate trusted by your browser. - -> NOTE: Using an IP address also works, including the browser being able to trust (validate) the SSL certificate. - -Configuring NGINX with a self-signed certificate to support SSL requires: - -- [Adding SSL (HTTPS) to Sourcegraph with a self-signed certificate](#adding-ssl-https-to-sourcegraph-with-a-self-signed-certificate) - - [1. Installing mkcert](#1-installing-mkcert) - - [2. Creating the self-signed certificate](#2-creating-the-self-signed-certificate) - - [3. Adding SSL support to NGINX](#3-adding-ssl-support-to-nginx) - - [4. Changing the Sourcegraph container to listen on port 443](#4-changing-the-sourcegraph-container-to-listen-on-port-443) - - [5. Getting the self-signed certificate to be trusted (valid) on external instances](#5-getting-the-self-signed-certificate-to-be-trusted-valid-on-external-instances) - - [Getting the self-signed cert trusted on other developer machines](#getting-the-self-signed-cert-trusted-on-other-developer-machines) - - [Next steps](#next-steps) - -## 1. Installing mkcert - -While the [OpenSSL](https://wiki.openssl.org/index.php/Command_Line_Utilities) CLI can generate self-signed certificates, its API is challenging unless you're well versed in SSL. - -A better alternative is [mkcert](https://github.com/FiloSottile/mkcert#mkcert), an abstraction over OpenSSL written by [Filippo Valsorda](https://github.com/FiloSottile), a cryptographer working at Google on the Go team. - -> NOTE: The following commands are to be run on the Docker host, **not** inside the Sourcegraph container. - -To set up mkcert on the Sourcegraph instance: - -1. [Install mkcert](https://github.com/FiloSottile/mkcert#installation) -1. Create the root [CA](https://en.wikipedia.org/wiki/Certificate_authority) by running: - -```bash -sudo CAROOT=~/.sourcegraph/config mkcert -install -``` - -## 2. Creating the self-signed certificate - -Now that the root CA has been created, mkcert can issue a self-signed certificate (`sourcegraph.crt`) and key (`sourcegraph.key`). - -```bash -sudo CAROOT=~/.sourcegraph/config mkcert \ - -cert-file ~/.sourcegraph/config/sourcegraph.crt \ - -key-file ~/.sourcegraph/config/sourcegraph.key \ - sourcegraph.example.com -``` - -Run `sudo ls -la ~/.sourcegraph/config` and you should see the CA and SSL certificates and keys. - -## 3. Adding SSL support to NGINX - -Edit the [default -`~/.sourcegraph/config/nginx.conf`](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/cmd/server/shared/assets/nginx.conf), -so that port `7080` redirects to `7443` and `7443` is served with SSL. It should look like this: - -```nginx -... -http { - ... - server { - listen 7080; - return 301 https://$host:7443$request_uri; - } - - server { - # Do not remove. The contents of sourcegraph_server.conf can change - # between versions and may include improvements to the configuration. - include nginx/sourcegraph_server.conf; - - listen 7443 ssl; - server_name sourcegraph.example.com; # change to your URL - ssl_certificate sourcegraph.crt; - ssl_certificate_key sourcegraph.key; - - location / { - ... - } - } -} -``` - -## 4. Changing the Sourcegraph container to listen on port 443 - -> NOTE: If the Sourcegraph container is still running, stop it before reading on. - -Now that NGINX is listening on port 7443, we need to configure the Sourcegraph container to forward -443 to 7443 by adding `--publish 443:7443` to the `docker run` command: - -```bash -docker container run \ - --rm \ - --publish 7080:7080 \ - --publish 443:7443 \ - \ - --volume ~/.sourcegraph/config:/etc/sourcegraph \ - --volume ~/.sourcegraph/data:/var/opt/sourcegraph \ - sourcegraph/server:{CURRENT_VERSION_NO_V} -``` - -> NOTE: We recommend removing `--publish 7080:7080` as it's not needed and traffic sent to that port is un-encrypted. - -Run the new Docker command, then validate by opening your browser at `https://sourcegraph.example.com`. - -If running Sourcegraph locally, the certificate will be valid because `mkcert` added the root CA to the list trusted by your OS. - -## 5. Getting the self-signed certificate to be trusted (valid) on external instances - -To have the browser trust the certificate, the root CA on the Sourcegraph instance must be installed locally by: - -**1.** [Installing mkcert locally](https://github.com/FiloSottile/mkcert#installation) - -**2.** Downloading `rootCA-key.pem` and `rootCA.pem` from `~/.sourcegraph/config/mkcert` on the Sourcegraph instance to the location of `mkcert -CAROOT` on your local machine: - -```bash -# Run locally: Ensure directory the root CA files will be downloaded to exists -mkdir -p "$(mkcert -CAROOT)" -``` - -```bash -# Run on Sourcegraph host: Ensure `scp` user can read (and therefore download) the root CA files -sudo chown $USER ~/.sourcegraph/config/root* -``` - -```bash -# Run locally: Download the files (change username and hostname) -scp user@example.com:~/.sourcegraph/config/root* "$(mkcert -CAROOT)" -``` - -**3.** Install the root CA by running: - -```bash -mkcert -install -``` - -Open your browser again at `https://sourcegraph.example.com` and this time, your certificate should be valid. - -### Getting the self-signed cert trusted on other developer machines - -This is largely the same as step 5, except easier. For other developer machines to trust the self-signed cert: - -- [Install mkcert](https://github.com/FiloSottile/mkcert#installation). -- Download the `rootCA-key.pem` and `rootCA.pem` from Slack or other internal system. -- Move the `rootCA-key.pem` and `rootCA.pem` files into the `mkcert -CAROOT` directory on their machine. -- Run `mkcert -install` on their machine. - -## Next steps - -- [Configure Sourcegraph's `externalURL`](/admin/config/site-config) -- [Redirect to external HTTPS URL](/self-hosted/http-https-configuration#redirect-to-external-https-url) -- [NGINX HTTP Strict Transport Security](/self-hosted/http-https-configuration#redirect-to-external-https-url) -- [NGINX SSL Termination guide](https://docs.nginx.com/nginx/admin-guide/security-controls/terminating-ssl-http/) -- [NGINX HTTPS Servers guide](https://nginx.org/en/docs/http/configuring_https_servers.html). diff --git a/src/data/redirects.ts b/src/data/redirects.ts index e6cfbc2e2..8fcdb8c25 100644 --- a/src/data/redirects.ts +++ b/src/data/redirects.ts @@ -1046,7 +1046,7 @@ const redirectsData = [ }, { source: '/admin/install/docker-compose/migrate', - destination: '/admin/deploy/docker-compose/migrate' + destination: '/self-hosted/deploy/docker-compose' }, { source: '/admin/install/docker-compose/operations', @@ -3191,7 +3191,7 @@ const redirectsData = [ }, { source: '/admin/deploy/docker-compose/migrate', - destination: '/self-hosted/deploy/docker-compose/migrate' + destination: '/self-hosted/deploy/docker-compose' }, { source: '/admin/deploy/docker-compose/operations', @@ -3568,11 +3568,11 @@ const redirectsData = [ }, { source: '/admin/sourcegraph-nginx-mermaid', - destination: '/self-hosted/sourcegraph-nginx-mermaid' + destination: '/self-hosted/http-https-configuration' }, { source: '/admin/ssl_https_self_signed_cert_nginx', - destination: '/self-hosted/ssl_https_self_signed_cert_nginx' + destination: '/self-hosted/http-https-configuration' }, { source: '/admin/updates/automatic', @@ -4244,7 +4244,19 @@ const redirectsData = [ }, { source: '/self-hosted/ssl_https_self_signed_cert_nginx', - destination: '/self-hosted/ssl-https-self-signed-cert-nginx' + destination: '/self-hosted/http-https-configuration' + }, + { + source: '/self-hosted/ssl-https-self-signed-cert-nginx', + destination: '/self-hosted/http-https-configuration' + }, + { + source: '/self-hosted/sourcegraph-nginx-mermaid', + destination: '/self-hosted/http-https-configuration' + }, + { + source: '/self-hosted/deploy/docker-compose/migrate', + destination: '/self-hosted/deploy/docker-compose' }, { source: '/self-hosted/updates/docker_compose',