Plumb sslmode into synapse postgres config

This commit is contained in:
Lee Verberne 2021-04-13 23:01:32 +02:00
parent 0c79b61ce1
commit 2d7589978d
3 changed files with 14 additions and 1 deletions

View file

@ -186,6 +186,17 @@ Set postgresql database
{{- end -}}
{{- end -}}
{{/*
Set postgresql sslmode
*/}}
{{- define "matrix-synapse.postgresql.sslmode" -}}
{{- if .Values.postgresql.enabled -}}
{{- default "prefer" .Values.postgresql.sslmode }}
{{- else -}}
{{- default "prefer" .Values.externalPostgresql.sslmode }}
{{- end -}}
{{- end -}}
{{/*
Set redis host
*/}}

View file

@ -35,6 +35,7 @@ stringData:
{{- $postgresUser := include "matrix-synapse.postgresql.username" . }}
{{- $postgresPort := include "matrix-synapse.postgresql.port" . }}
{{- $postgresPass := include "matrix-synapse.postgresql.password" . }}
{{- $postgresSSLMode := include "matrix-synapse.postgresql.sslmode" . }}
## Database configuration ##
@ -50,6 +51,7 @@ stringData:
database: {{ $postgresDB | quote }}
host: {{ $postgresHost | quote }}
port: {{ $postgresPort }}
sslmode: {{ $postgresSSLMode | quote }}
cp_min: 5
cp_max: 10

View file

@ -555,7 +555,7 @@ externalPostgresql:
username: synapse
# password: synapse
database: synapse
# sslMode: require
# sslmode: prefer
## This configuration is for the internal Redis that's deployed for use with
## workers/sharding, for an external Redis server you want to set enabled to