From 509cd56aca9bb226dec126abfb006e00302753ad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 27 Feb 2018 17:19:22 +0100 Subject: [PATCH] Add warning in production.yaml To avoid confusion with the local-production.json file --- config/production.yaml.example | 13 +++++++++++++ server/controllers/api/config.ts | 1 + 2 files changed, 14 insertions(+) diff --git a/config/production.yaml.example b/config/production.yaml.example index 402759132..4435a7394 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -42,6 +42,19 @@ storage: log: level: 'info' # debug/info/warning/error + +############################################################################### +# +# From this point, all the following keys can be overrode by the web interface +# (local-production.json file). If you need to change some values, prefer to +# use the web interface because the configuration will be automatically +# reloaded without any need to restart PeerTube. +# +# /!\ If you already have a local-production.json file, the modification of the +# following keys will have no effect /!\. +# +############################################################################### + cache: previews: size: 100 # Max number of previews you want to cache diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 8cfaf3e29..47b91cd94 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -114,6 +114,7 @@ async function updateCustomConfig (req: express.Request, res: express.Response, // Need to change the videoQuota key a little bit const toUpdateJSON = omit(toUpdate, 'videoQuota') toUpdateJSON.user['video_quota'] = toUpdate.user.videoQuota + delete toUpdate.user.videoQuota await writeFilePromise(CONFIG.CUSTOM_FILE, JSON.stringify(toUpdateJSON))