Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: we use sslmode not pgsslmode in the deploy repos #957

Merged
merged 3 commits into from
Feb 21, 2025
Merged

fix: we use sslmode not pgsslmode in the deploy repos #957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fe05ce
fix: we use sslmode not pgsslmode in the deploy repos
Chickensoupwithrice Feb 5, 2025
f57aa3b
fix: address Marc's comments
Chickensoupwithrice Feb 20, 2025
a6a192c
Merge branch 'main' into al/fix-sslmode-docs
Chickensoupwithrice Feb 20, 2025
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
2 changes: 1 addition & 1 deletion docs/admin/deploy/docker-single-container/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ $ docker run \
-e PGUSER='sg' \
-e PGPASSWORD='sg' \
-e PGDATABASE='sourcegraph' \
-e PGSSLMODE='disable' \
-e SSLMODE='disable' \
-e CODEINTEL_PGHOST='pgsql' \
-e CODEINTEL_PGPORT='5432' \
-e CODEINTEL_PGUSER='sg' \
Expand Down
8 changes: 4 additions & 4 deletions docs/admin/deploy/kubernetes/index.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ data:
password: ""
port: ""
user: ""
pgsslmode: "require" # optional, enable if using SSL
sslmode: "require" # optional, enable if using SSL
---
apiVersion: v1
kind: Secret
Expand All @@ -116,7 +116,7 @@ data:
password: ""
port: ""
user: ""
pgsslmode: "require" # optional, enable if using SSL
sslmode: "require" # optional, enable if using SSL
---
apiVersion: v1
kind: Secret
Expand All @@ -129,7 +129,7 @@ data:
password: ""
port: ""
user: ""
pgsslmode: "require" # optional, enable if using SSL
sslmode: "require" # optional, enable if using SSL
```

The above Secrets should be deployed to the same namespace as the existing Sourcegraph deployment.
Expand Down Expand Up @@ -166,7 +166,7 @@ pgsql:
user: "new-user"
password: "new-password"
port: "5432"
pgsslmode: "require" # optional, enable if using SSL
sslmode: "require" # optional, enable if using SSL
```

#### Using external Redis instances
Expand Down
10 changes: 5 additions & 5 deletions docs/admin/external_services/postgres.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The addition of `PG*` environment variables to your Sourcegraph deployment files
- `PGUSER`
- `PGPASSWORD`
- `PGDATABASE`
- `PGSSLMODE`
- `SSLMODE`

To externalize the _code navigation database_, use the following prefixed `CODEINTEL_PG*` variables:

Expand All @@ -49,7 +49,7 @@ docker run [...]
-e PGUSER=sourcegraph
-e PGPASSWORD=secret
-e PGDATABASE=sourcegraph
-e PGSSLMODE=require
-e SSLMODE=require
-e CODEINTEL_PGHOST=psql2.mycompany.org
-e CODEINTEL_PGUSER=sourcegraph
-e CODEINTEL_PGPASSWORD=secret
Expand All @@ -69,7 +69,7 @@ sourcegraph-frontend-0:
- 'PGUSER=sourcegraph'
- 'PGPASSWORD=secret'
- 'PGDATABASE=sourcegraph'
- 'PGSSLMODE=require'
- 'SSLMODE=require'
- 'CODEINTEL_PGHOST=psql2.mycompany.org'
- 'CODEINTEL_PGUSER=sourcegraph'
- 'CODEINTEL_PGPASSWORD=secret'
Expand Down Expand Up @@ -125,7 +125,7 @@ In order to enable IAM Auth, you first need to:
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:

- `PG_CONNECTION_UPDATER=EC2_ROLE_CREDENTIALS`
- `PGSSLMODE=require`
- `SSLMODE=require`
- `PGHOST=<>`
- `PGPORT=<>`
- `PGUSER=<>` - this should be the database accounts created above
Expand Down Expand Up @@ -208,7 +208,7 @@ spec:
value: sourcegraph-pgbouncer
- name: PGPORT
value: "5432"
- name: PGSSLMODE
- name: SSLMODE
value: disable
- name: PGUSER
value: sg
Expand Down
4 changes: 2 additions & 2 deletions docs/admin/updates/migrator/migrator-operations.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PGPORT: "5432"
PGUSER: "sg"
PGPASSWORD: "sg"
PGDATABASE: "sg"
PGSSLMODE: "disable"
SSLMODE: "disable"
CODEINTEL_PGHOST: "codeintel-db"
CODEINTEL_PGPORT: "5432"
CODEINTEL_PGUSER: "sg"
Expand Down Expand Up @@ -387,7 +387,7 @@ docker run \
-e PGUSER='sg' \
-e PGPASSWORD='sg' \
-e PGDATABASE='sg' \
-e PGSSLMODE='disable' \
-e SSLMODE='disable' \
-e CODEINTEL_PGHOST='codeintel-db' \
-e CODEINTEL_PGPORT='5432' \
-e CODEINTEL_PGUSER='sg' \
Expand Down