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.

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

Certificate improvements #3081

Merged
merged 1 commit into from
Nov 7, 2024
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
4 changes: 4 additions & 0 deletions deployment/docker_compose/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@ services:
max-size: "50m"
max-file: "6"
# Uncomment the following lines if you need to include a custom CA certificate
# This section enables the use of a custom CA certificate
# If present, the custom CA certificate is mounted as a volume
# The container checks for its existence and updates the system's CA certificates
# This allows for secure communication with services using custom SSL certificates
# Optional volume mount for CA certificate
# volumes:
# # Maps to the CA_CERT_PATH environment variable in the Dockerfile
Expand Down
4 changes: 4 additions & 0 deletions deployment/docker_compose/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ services:
max-size: "50m"
max-file: "6"
# Uncomment the following lines if you need to include a custom CA certificate
# This section enables the use of a custom CA certificate
# If present, the custom CA certificate is mounted as a volume
# The container checks for its existence and updates the system's CA certificates
# This allows for secure communication with services using custom SSL certificates
# volumes:
# # Maps to the CA_CERT_PATH environment variable in the Dockerfile
# - ${CA_CERT_PATH:-./custom-ca.crt}:/etc/ssl/certs/custom-ca.crt:ro
Expand Down
16 changes: 11 additions & 5 deletions deployment/kubernetes/background-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ spec:
image: danswer/danswer-backend:latest
imagePullPolicy: IfNotPresent
command:
[
"/usr/bin/supervisord",
"-c",
"/etc/supervisor/conf.d/supervisord.conf",
]
- "/bin/sh"
- "-c"
- |
if [ -f /etc/ssl/certs/custom-ca.crt ]; then
update-ca-certificates;
fi &&
/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
env:
- name: REDIS_PASSWORD
valueFrom:
Expand All @@ -32,6 +34,10 @@ spec:
- configMapRef:
name: env-configmap
# Uncomment the following lines if you need to include a custom CA certificate
# This section allows for the inclusion of a custom CA certificate
# If a custom CA certificate is present, it updates the system's CA certificates
# This is useful for environments with self-signed or internal CA certificates
# The certificate is mounted as a volume and the container checks for its presence
# Optional volume mount for CA certificate
# volumeMounts:
# - name: my-ca-cert-volume
Expand Down
Loading