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

matrix-synapse: Fix ternary with --set

Browse source
This commit is contained in:
Alexander Olofsson 2021-03-20 20:44:38 +01:00
parent 6cbb8bf9fd
commit c13ac3d9a4
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/matrix-synapse/templates/worker-configuration.yaml
View file

@ -21,7 +21,7 @@ data:
{{- $name := $worker | replace "_" "-" }} {{- $name := $worker | replace "_" "-" }}
{{ $name }}.worker: | {{ $name }}.worker: |
worker_app: "synapse.app.{{ $config.generic | ternary "generic_worker" $worker }}" worker_app: "synapse.app.{{ (not (not $config.generic)) | ternary "generic_worker" $worker }}"
{{- if $config.name -}} {{- if $config.name -}}
{{- if (ne $config.replicaCount 1) -}} {{- if (ne $config.replicaCount 1) -}}
{{- fail "Replica count must be 1 if a worker has a unique name." -}} {{- fail "Replica count must be 1 if a worker has a unique name." -}}

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

@ -63,7 +63,7 @@ spec:
-e "s/@@REDIS_PASSWORD@@/${REDIS_PASSWORD:-}/" \ -e "s/@@REDIS_PASSWORD@@/${REDIS_PASSWORD:-}/" \
> /synapse/config/conf.d/secrets.yaml > /synapse/config/conf.d/secrets.yaml
exec python -B -m synapse.app.{{ $config.generic | ternary "generic_worker" $worker }} \ exec python -B -m synapse.app.{{ (not (not $config.generic)) | ternary "generic_worker" $worker }} \
-c /synapse/config/homeserver.yaml \ -c /synapse/config/homeserver.yaml \
-c /synapse/config/conf.d/ \ -c /synapse/config/conf.d/ \
-c /synapse/config/{{ $name }}.worker -c /synapse/config/{{ $name }}.worker