Add warning in production.yaml

To avoid confusion with the local-production.json file

diff --git a/config/production.yaml.example b/config/production.yaml.example
index 40275913291bbdda91f842cdd48be3cda72019cc..4435a739481adf50d669d526eb0f89be9c399d99 100644 (file)
--- 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 8cfaf3e29759ba3a558884ab11170e3c95c7c476..47b91cd94bf04459dcd8b3bf7829e228a1bbbd38 100644 (file)
--- 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))