diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-09-22 17:27:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 17:27:15 +0200 |
| commit | 4b7e43602691193b5d2a8e7e0ed6044bc8ee9774 (patch) | |
| tree | 87bd664e538b02ed5d8a916cbd34e7891349bec6 | |
| parent | 3d05ebfdc3524cff9f01b760176e175e73b55875 (diff) | |
| parent | 7c25251a3958c67f623953c879649dbe616c66c4 (diff) | |
Merge pull request #1606 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
| -rw-r--r-- | chart/values.yaml | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chart/values.yaml b/chart/values.yaml index a638f4a7d..ff45a7b61 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -60,7 +60,7 @@ mastodon: concurrency: 25 smtp: auth_method: plain - ca_file: + ca_file: /etc/ssl/certs/ca-certificates.crt delivery_method: smtp domain: enable_starttls_auto: true diff --git a/yarn.lock b/yarn.lock index 39e8fc449..f842c2eac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10625,9 +10625,9 @@ tiny-warning@^1.0.0: integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== tmpl@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-arraybuffer@^1.0.0: version "1.0.1" |