diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-16 09:42:32 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-16 09:42:32 +0200 |
| commit | 040b7d37a460e5f023f7654b1b619368cbbc24ea (patch) | |
| tree | 251a14cd362a6d98c1721e8f3f54fc386165e464 /chart/templates | |
| parent | 94e98864e39c010635e839fea984f2b4893bef1a (diff) | |
| parent | c3fac61f56b3ad63534961f3d3c426cdf8ac6213 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit.
Diffstat (limited to 'chart/templates')
| -rw-r--r-- | chart/templates/configmap-env.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chart/templates/configmap-env.yaml b/chart/templates/configmap-env.yaml index 5e0620998..aa242684f 100644 --- a/chart/templates/configmap-env.yaml +++ b/chart/templates/configmap-env.yaml @@ -83,6 +83,9 @@ data: SMTP_TLS: {{ .Values.mastodon.smtp.tls | quote }} {{- end }} STREAMING_CLUSTER_NUM: {{ .Values.mastodon.streaming.workers | quote }} + {{- if .Values.mastodon.streaming.base_url }} + STREAMING_API_BASE_URL: {{ .Values.mastodon.streaming.base_url | quote }} + {{- end }} {{- if .Values.externalAuth.oidc.enabled }} OIDC_ENABLED: {{ .Values.externalAuth.oidc.enabled | quote }} OIDC_DISPLAY_NAME: {{ .Values.externalAuth.oidc.display_name }} @@ -300,4 +303,4 @@ data: {{- if .Values.externalAuth.ldap.uid_conversion.replace }} LDAP_UID_CONVERSION_REPLACE: {{ .Values.externalAuth.ldap.uid_conversion.replace }} {{- end }} - {{- end }} \ No newline at end of file + {{- end }} |