pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

matrix-synapse: Fix remainders of old serverName

Browse source
This commit is contained in:
Alexander Olofsson 2020-08-13 20:42:31 +02:00
parent 73a9542625
commit 92c529446b
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/matrix-synapse/templates/NOTES.txt
View file

@ -7,7 +7,7 @@ accesses to the services yourself.
Your Synapse install is now starting, you should soon be able to access it on
the following URL(s);
{{- range (concat .Values.ingress.hosts (list .Values.config.serverName)) }}
{{- range (concat .Values.ingress.csHosts (list (.Values.publicServerName | default .Values.serverName))) }}
{{- if $.Values.ingress.tls }}
https://{{ . }}
{{- else }}

4
charts/matrix-synapse/templates/configuration.yaml
View file

@ -33,8 +33,8 @@ data:
## Server ##
server_name: {{ required "You need to specify a server name" .Values.config.serverName | quote }}
public_baseurl: {{ .Values.config.publicBaseurl | default (printf "https://%s" (.Values.config.publicServerName | default .Values.config.serverName)) | quote }}
server_name: {{ required "You need to specify a serverName" .Values.serverName | quote }}
public_baseurl: {{ .Values.config.publicBaseurl | default (printf "https://%s" (.Values.publicServerName | default .Values.serverName)) | quote }}
pid_file: /homeserver.pid
web_client: False
soft_file_limit: 0

2
charts/matrix-synapse/templates/deployment.yaml
View file

@ -1,6 +1,6 @@
{{- $needsVolumePermissions := and .Values.volumePermissions.enabled (or .Values.persistence.enabled .Values.persistence.existingClaim) }}
---
# Server: {{ required "A valid .Values.config.serverName is required" .Values.config.serverName }}
# Server: {{ required "A valid serverName is required" .Values.serverName }}
apiVersion: apps/v1
kind: Deployment
metadata:

6
charts/matrix-synapse/templates/ingress.yaml
View file

@ -29,15 +29,15 @@ spec:
rules:
{{- $csHosts := .Values.ingress.csHosts }}
{{- if .Values.ingress.includeServerName }}
{{- $csHosts = concat (list (.Values.config.publicServerName | default .Values.config.serverName)) $csHosts }}
{{- $csHosts = concat (list (.Values.publicServerName | default .Values.serverName)) $csHosts }}
{{- end }}
{{- $s2sHosts := .Values.ingress.hosts }}
{{- if .Values.ingress.includeServerName }}
{{- $s2sHosts = concat (list .Values.config.serverName) $s2sHosts }}
{{- $s2sHosts = concat (list .Values.serverName) $s2sHosts }}
{{- end }}
{{- $wkHosts := .Values.ingress.wkHosts }}
{{- if .Values.ingress.includeServerName }}
{{- $wkHosts = concat (list .Values.config.serverName) $wkHosts }}
{{- $wkHosts = concat (list .Values.serverName) $wkHosts }}
{{- end }}
{{- $hosts := uniq (concat $s2sHosts $csHosts $wkHosts) }}
{{- range $hosts }}

2
charts/matrix-synapse/templates/well-known-config.yaml
View file

@ -39,5 +39,5 @@ data:
"content-type" => "application/json"
)
server.json: |-
{{ dict "m.server" (printf "%s:%d" (.Values.wellknown.host | default (.Values.config.publicServerName | default .Values.config.serverName)) (.Values.wellknown.port | default 443)) | toJson | indent 4 }}
{{ dict "m.server" (printf "%s:%d" (.Values.wellknown.host | default (.Values.publicServerName | default .Values.serverName)) (.Values.wellknown.port | default 443)) | toJson | indent 4 }}
{{- end }}