diff options
author | Chocobozzz <me@florianbigard.com> | 2021-12-15 15:58:10 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-12-16 10:08:55 +0100 |
commit | a9bfa85d2cdf13670aaced740da5b493fbeddfce (patch) | |
tree | 3781c9218d4cc7786b6589365c0efbed2151703d /server/lib | |
parent | c77fdc605b3ccc1ab6890f889d8200fbe9372949 (diff) | |
download | PeerTube-a9bfa85d2cdf13670aaced740da5b493fbeddfce.tar.gz PeerTube-a9bfa85d2cdf13670aaced740da5b493fbeddfce.tar.zst PeerTube-a9bfa85d2cdf13670aaced740da5b493fbeddfce.zip |
Add ability for admins to set default p2p policy
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/auth/oauth-model.ts | 1 | ||||
-rw-r--r-- | server/lib/server-config-manager.ts | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/server/lib/auth/oauth-model.ts b/server/lib/auth/oauth-model.ts index f2ef0a78a..754bee36d 100644 --- a/server/lib/auth/oauth-model.ts +++ b/server/lib/auth/oauth-model.ts | |||
@@ -226,6 +226,7 @@ async function createUserFromExternal (pluginAuth: string, options: { | |||
226 | password: null, | 226 | password: null, |
227 | email: options.email, | 227 | email: options.email, |
228 | nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, | 228 | nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, |
229 | p2pEnabled: CONFIG.DEFAULTS.P2P.ENABLED, | ||
229 | autoPlayVideo: true, | 230 | autoPlayVideo: true, |
230 | role: options.role, | 231 | role: options.role, |
231 | videoQuota: CONFIG.USER.VIDEO_QUOTA, | 232 | videoQuota: CONFIG.USER.VIDEO_QUOTA, |
diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts index 8aea4cd6d..d759f85e1 100644 --- a/server/lib/server-config-manager.ts +++ b/server/lib/server-config-manager.ts | |||
@@ -61,6 +61,9 @@ class ServerConfigManager { | |||
61 | commentsEnabled: CONFIG.DEFAULTS.PUBLISH.COMMENTS_ENABLED, | 61 | commentsEnabled: CONFIG.DEFAULTS.PUBLISH.COMMENTS_ENABLED, |
62 | privacy: CONFIG.DEFAULTS.PUBLISH.PRIVACY, | 62 | privacy: CONFIG.DEFAULTS.PUBLISH.PRIVACY, |
63 | licence: CONFIG.DEFAULTS.PUBLISH.LICENCE | 63 | licence: CONFIG.DEFAULTS.PUBLISH.LICENCE |
64 | }, | ||
65 | p2p: { | ||
66 | enabled: CONFIG.DEFAULTS.P2P.ENABLED | ||
64 | } | 67 | } |
65 | }, | 68 | }, |
66 | 69 | ||