Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions docs/admin/auth/saml/microsoft-adfs.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions docs/admin/code-hosts/other.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/config/site-config.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/how-to/site-admin-quickstart.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/pings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/admin/subscriptions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

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

[Contact us](https://about.sourcegraph.com/contact) to ask about volume discounts for Sourcegraph Enterprise.

## 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

Expand Down
6 changes: 3 additions & 3 deletions docs/cloud/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
227 changes: 0 additions & 227 deletions docs/self-hosted/deploy/docker-compose/migrate.mdx

This file was deleted.

8 changes: 2 additions & 6 deletions docs/self-hosted/deploy/migrate-backup.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
Loading
Loading