diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
| commit | b9f351d8455f672137a34ea0ea0b1050fba3464b (patch) | |
| tree | 4a2dd275ddecf46760ccb8140fac5f6cb21ac766 /chart/values.yaml.template | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
| parent | 5d9acc0ce41aa0274fef2dd321a8fad1fb0665ea (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.
Diffstat (limited to 'chart/values.yaml.template')
| -rw-r--r-- | chart/values.yaml.template | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chart/values.yaml.template b/chart/values.yaml.template index 4a8286d00..694bc4d42 100644 --- a/chart/values.yaml.template +++ b/chart/values.yaml.template @@ -16,6 +16,12 @@ ingress: kubernetes.io/ingress.class: nginx kubernetes.io/tls-acme: "true" # cert-manager.io/cluster-issuer: "letsencrypt" + # + # ensure that NGINX's upload size matches Mastodon's + # for the K8s ingress controller: + # nginx.ingress.kubernetes.io/proxy-body-size: 40m + # for the NGINX ingress controller: + # nginx.org/client-max-body-size: 40m # this value is used for LOCAL_DOMAIN hostname: mastodon.local tls: |