Skip to content

Commit ab5b764

Browse files
authored
Merge branch 'main' into hackathon-parity
2 parents 1fbf530 + fb2df93 commit ab5b764

31 files changed

+338
-229
lines changed

docs/admin/auth/builtin.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ New users can submit a form and site admins will see the request in the navbar o
5757

5858
![List of pending access requests for admin to approve](https://storage.googleapis.com/sourcegraph-assets/docs/images/admin/auth/pending-access-requests.png)
5959

60+
## Disable account requests from users
61+
6062
The account request feature can be disabled by setting `"auth.accessRequest": { "enabled": false }`. When disabled, new user accounts can only be created by the site admin manually.
6163

6264
## Creating builtin authentication users

docs/admin/code_hosts/go.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Each entry in the `"urls"` array can contain basic auth if needed (e.g. `https:/
2828
## Rate limiting
2929

3030
By default, requests to the Go module proxies will be rate-limited
31-
based on a default internal limit. ([source](https://github.com/sourcegraph/sourcegraph/blob/main/schema/go-modules.schema.json))
31+
based on a default internal limit. ([source](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/schema/go-modules.schema.json))
3232

3333
```json
3434
"rateLimit": {

docs/admin/code_hosts/non-git.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ For more complex setups, configure your `src-expose` by providing a local config
114114
src-expose -snapshot-config config.yaml
115115
```
116116

117-
See [an example YAML file containing available configuration options](https://github.com/sourcegraph/sourcegraph/blob/main/dev/src-expose/examples/example.yaml).
117+
See [an example YAML file containing available configuration options](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/dev/src-expose/examples/example.yaml).

docs/admin/config/private-network.mdx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ A **private network** refers to a secure network environment segregated from the
44
When deploying self-hosted Sourcegraph instances in private networks with specific compliance and policy requirements, additional configuration may be required to ensure all networking features function correctly. The reasons for applying the following configuration options depend on the specific functionality of the Sourcegraph service and the unique network and infrastructure requirements of the organization.
55

66
The following is a list of Sourcegraph services and how and when each initiates outbound connections to external services:
7+
- **executor**: Sourcegraph [Executor](../executors) batch change or precise indexing jobs may need to connect to services hosted within an organization's private network
78
- **frontend**: The frontend service communicates externally when connecting to external [auth providers](../auth), sending [telemetry data](../pings), testing code host connections, and connecting to [externally hosted](../external_services) Sourcegraph services
89
- **gitserver**: Executes git commands against externally hosted [code hosts](../external_service)
9-
- **repo-updater**: Communicates with [code hosts](../external_service) APIs to coordinate repository synchronization
1010
- **migrator**: Connects to Postgres instances (which may be [externally hosted](../external_services/postgres)) to process database migrations
11-
- **executor**: Sourcegraph [Executor](../executors) batch change or precise indexing jobs may need to connect to services hosted within an organization's private network
11+
- **repo-updater**: Communicates with [code hosts](../external_service) APIs to coordinate repository synchronization
12+
- **worker**: Sourcegraph [Worker](../workers) run various background jobs that may require establishing connections to services hosted within an organization's private network
1213

1314
## HTTP proxy configuration
1415
All Sourcegraph services respect the conventional `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` environment variables for routing Sourcegraph client application HTTP traffic through a proxy server. The steps for configuring proxy environment variables will depend on your Sourcegraph deployment method.
@@ -17,14 +18,14 @@ All Sourcegraph services respect the conventional `HTTP_PROXY`, `HTTPS_PROXY`, a
1718
Add the proxy environment variables to your Sourcegraph Helm chart [override file](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/values.yaml):
1819

1920
```yaml
20-
frontend|gitserver|repo-updater:
21+
executor|frontend|gitserver|migrator|repo-updater|worker:
2122
env:
2223
- name: HTTP_PROXY
2324
value: http://proxy.example.com:8080
2425
- name: HTTPS_PROXY
2526
value: http://proxy.example.com:8080
2627
- name: NO_PROXY
27-
value: "*.cluster.local,blobstore,codeinsights-db,codeintel-db,sourcegraph-frontend-internal,sourcegraph-frontend,github-proxy,gitserver,grafana,indexed-search-indexer,indexed-search,jaeger-query,pgsql,precise-code-intel-worker,prometheus,redis-cache,redis-store,repo-updater,searcher,symbols,syntect-server,worker-executors,worker"
28+
value: "blobstore,codeinsights-db,codeintel-db,sourcegraph-frontend-internal,sourcegraph-frontend,github-proxy,gitserver,grafana,indexed-search-indexer,indexed-search,jaeger-query,pgsql,precise-code-intel-worker,prometheus,redis-cache,redis-store,repo-updater,searcher,symbols,syntect-server,worker-executors,worker,cloud-sql-proxy,localhost,127.0.0.1,.svc,.svc.cluster.local,kubernetes.default.svc"
2829
```
2930
3031
<Callout type="warning">Failure to configure `NO_PROXY` correctly can cause the proxy configuration to interfere with local networking between internal Sourcegraph services.</Callout>

docs/admin/deploy/kubernetes/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ Some Persistent Volumes may be retained after the uninstall phase is complete. I
11051105
[AWS EBS CSI driver]: https://docs.aws.amazon.com/eks/latest/userguide/managing-ebs-csi.html
11061106
[NGINX Ingress Controller]: https://github.com/kubernetes/ingress-nginx
11071107
[Helm Changelog]: https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/CHANGELOG
1108-
[Sourcegraph Changelog]: https://github.com/sourcegraph/sourcegraph/blob/main/CHANGELOG
1108+
[Sourcegraph Changelog]: https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/CHANGELOG
11091109
[Sourcegraph Migrator]: https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph-migrator
11101110
[Helm Diff]: https://github.com/databus23/helm-diff
11111111
[Secrets]: https://kubernetes.io/docs/concepts/configuration/secret/

docs/admin/executors/deploy_executors_terraform.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ Next, you can test whether the number of executors rises and shrinks as load spi
410410
## Upgrading executors
411411

412412
Upgrading executors is relatively uninvolved. Simply follow the instructions below.
413-
Also, check the [changelog](https://github.com/sourcegraph/sourcegraph/blob/main/CHANGELOG) for any Executors related breaking changes or new features or flags that you might want to configure. See [Executors maintenance](/admin/executors/deploy_executors#Maintaining-and-upgrading-executors) for version compatability.
413+
Also, check the [changelog](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/CHANGELOG) for any Executors related breaking changes or new features or flags that you might want to configure. See [Executors maintenance](/admin/executors/deploy_executors#Maintaining-and-upgrading-executors) for version compatability.
414414

415415
### **Step 1:** Update the source version of the terraform modules
416416

docs/admin/external_services/postgres.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ In order to enable IAM Auth, you first need to:
122122
- For EKS (k8s deployment), use [IAM roles for service accounts](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html)
123123
- For EC2 (docker-compose deployment), use [IAM roles for Amazon EC2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
124124

125-
For [every services that require postgres database connection](https://github.com/sourcegraph/sourcegraph/blob/main/lib/servicecatalog/service-catalog.yaml), ensure below environment variables are configured:
125+
For [every services that require postgres database connection](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/lib/servicecatalog/service-catalog.yaml), ensure below environment variables are configured:
126126

127127
- `PG_CONNECTION_UPDATER=EC2_ROLE_CREDENTIALS`
128128
- `PGSSLMODE=require`
@@ -315,7 +315,7 @@ The first migration fails since it attempts to add `COMMENT`s to installed exten
315315
failed to run migration for schema "frontend": failed upgrade migration 1528395834: ERROR: current transaction is aborted, commands ignored until end of transaction block (SQLSTATE 25P02)
316316
```
317317

318-
In this case, locate the UP [migration 1528395834](https://github.com/sourcegraph/sourcegraph/blob/main/migrations/frontend/1528395834_squashed_migrations.up.sql) and apply all SQL after the final `COMMENT ON EXTENSION` command following the [dirty database procedure](/admin/how-to/dirty_database).
318+
In this case, locate the UP [migration 1528395834](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/migrations/frontend/1528395834_squashed_migrations.up.sql) and apply all SQL after the final `COMMENT ON EXTENSION` command following the [dirty database procedure](/admin/how-to/dirty_database).
319319

320320
**Dropping the `sg_service` role**
321321

docs/admin/how-to/dirty_database.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Migration definitions for each database schema can be found in the children of t
8484

8585
**Find the target migration with the version number identified in [step 1](#1-identify-incomplete-migration)**.
8686

87-
**Run the code from the identified `<version>/up.sql` file explicitly using the `psql` CLI**. For example, if we take `version=1644515056` as an example, we can run the contents of [up migration file](https://github.com/sourcegraph/sourcegraph/blob/b20107113548ed7eeb8ba22d1fdb41e8d692cf18/migrations/frontend/1644515056/up.sql) via psql.
87+
**Run the code from the identified `<version>/up.sql` file explicitly using the `psql` CLI**. For example, if we take `version=1644515056` as an example, we can run the contents of [up migration file](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/b20107113548ed7eeb8ba22d1fdb41e8d692cf18/migrations/frontend/1644515056/up.sql) via psql.
8888

8989
```bash
9090
$ psql -h ... -U sg

docs/admin/how-to/dirty_database_pre_3_37.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ Additionally Grafana will alert you of an index is in this state. _The Grafana a
9696
## Further resources
9797

9898
* [Sourcegraph - Upgrading Sourcegraph to a new version](/admin/updates)
99-
* [Migrations README](https://github.com/sourcegraph/sourcegraph/blob/main/migrations/README) (Note some of the info contained here pertains to running Sourcegraphs development environment and should not be used on production instances)
99+
* [Migrations README](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/migrations/README) (Note some of the info contained here pertains to running Sourcegraphs development environment and should not be used on production instances)

docs/admin/http_https_configuration.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Sourcegraph's single Docker image and Kubernetes deployments use [NGINX](https:/
1919

2020
### Sourcegraph single instance (Docker)
2121

22-
The first time Sourcegraph is run, it will create an [`nginx.conf`](https://github.com/sourcegraph/sourcegraph/blob/main/cmd/server/shared/assets/nginx.conf) file at:
22+
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:
2323

2424
- `~/.sourcegraph/config/nginx.conf` on the Docker/Sourcegraph host (presuming you're using the [quickstart `docker run` command](/#quick-install))
2525
- `/etc/sourcegraph/nginx.conf` inside the container

0 commit comments

Comments
 (0)