From b65de1be4dcf626c552be613d531d3f6e23c6085 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 16 Dec 2021 09:38:27 +0100 Subject: Use different p2p policy for embeds and webapp --- server/lib/auth/oauth-model.ts | 2 +- server/lib/server-config-manager.ts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'server/lib') diff --git a/server/lib/auth/oauth-model.ts b/server/lib/auth/oauth-model.ts index 754bee36d..b68cce6d2 100644 --- a/server/lib/auth/oauth-model.ts +++ b/server/lib/auth/oauth-model.ts @@ -226,7 +226,7 @@ async function createUserFromExternal (pluginAuth: string, options: { password: null, email: options.email, nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, - p2pEnabled: CONFIG.DEFAULTS.P2P.ENABLED, + p2pEnabled: CONFIG.DEFAULTS.P2P.WEBAPP.ENABLED, autoPlayVideo: true, role: options.role, videoQuota: CONFIG.USER.VIDEO_QUOTA, diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts index d759f85e1..18032ef86 100644 --- a/server/lib/server-config-manager.ts +++ b/server/lib/server-config-manager.ts @@ -63,7 +63,12 @@ class ServerConfigManager { licence: CONFIG.DEFAULTS.PUBLISH.LICENCE }, p2p: { - enabled: CONFIG.DEFAULTS.P2P.ENABLED + webapp: { + enabled: CONFIG.DEFAULTS.P2P.WEBAPP.ENABLED + }, + embed: { + enabled: CONFIG.DEFAULTS.P2P.EMBED.ENABLED + } } }, -- cgit v1.2.3