summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/admin/update-meta.ts
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2020-04-12 20:32:34 +0900
committerGitHub <noreply@github.com>2020-04-12 20:32:34 +0900
commit36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0 (patch)
tree6fb00ab7bdf952ebb7e0c6e705fc5837a8022689 /src/server/api/endpoints/admin/update-meta.ts
parentResolve #6242 (diff)
downloadsharkey-36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0.tar.gz
sharkey-36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0.tar.bz2
sharkey-36b9a0d42fa4bd7036d5d4a11203006d0ceb59f0.zip
プロキシの除外ホスト (#6244)
* プロキシの除外ホスト * オブジェクトストレージとの通信にProxyを使うかを選択できるように * fix lint * コメント Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
Diffstat (limited to 'src/server/api/endpoints/admin/update-meta.ts')
-rw-r--r--src/server/api/endpoints/admin/update-meta.ts8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index e9527d9ac5..1bc20029ef 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -394,6 +394,10 @@ export const meta = {
objectStorageUseSSL: {
validator: $.optional.bool
},
+
+ objectStorageUseProxy: {
+ validator: $.optional.bool
+ }
}
};
@@ -632,6 +636,10 @@ export default define(meta, async (ps, me) => {
set.objectStorageUseSSL = ps.objectStorageUseSSL;
}
+ if (ps.objectStorageUseProxy !== undefined) {
+ set.objectStorageUseProxy = ps.objectStorageUseProxy;
+ }
+
await getConnection().transaction(async transactionalEntityManager => {
const meta = await transactionalEntityManager.findOne(Meta, {
order: {