aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-02-27 17:19:22 +0100
committerChocobozzz <me@florianbigard.com>2018-02-27 17:19:22 +0100
commit509cd56aca9bb226dec126abfb006e00302753ad (patch)
treeed6b8492e9bc6b70d986845634830d4a7c1e7100
parent2c29ad4f3b736912ae769a288c4795dce40e388d (diff)
downloadPeerTube-509cd56aca9bb226dec126abfb006e00302753ad.tar.gz
PeerTube-509cd56aca9bb226dec126abfb006e00302753ad.tar.zst
PeerTube-509cd56aca9bb226dec126abfb006e00302753ad.zip
Add warning in production.yaml
To avoid confusion with the local-production.json file
-rw-r--r--config/production.yaml.example13
-rw-r--r--server/controllers/api/config.ts1
2 files changed, 14 insertions, 0 deletions
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:
42log: 42log:
43 level: 'info' # debug/info/warning/error 43 level: 'info' # debug/info/warning/error
44 44
45
46###############################################################################
47#
48# From this point, all the following keys can be overrode by the web interface
49# (local-production.json file). If you need to change some values, prefer to
50# use the web interface because the configuration will be automatically
51# reloaded without any need to restart PeerTube.
52#
53# /!\ If you already have a local-production.json file, the modification of the
54# following keys will have no effect /!\.
55#
56###############################################################################
57
45cache: 58cache:
46 previews: 59 previews:
47 size: 100 # Max number of previews you want to cache 60 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,
114 // Need to change the videoQuota key a little bit 114 // Need to change the videoQuota key a little bit
115 const toUpdateJSON = omit(toUpdate, 'videoQuota') 115 const toUpdateJSON = omit(toUpdate, 'videoQuota')
116 toUpdateJSON.user['video_quota'] = toUpdate.user.videoQuota 116 toUpdateJSON.user['video_quota'] = toUpdate.user.videoQuota
117 delete toUpdate.user.videoQuota
117 118
118 await writeFilePromise(CONFIG.CUSTOM_FILE, JSON.stringify(toUpdateJSON)) 119 await writeFilePromise(CONFIG.CUSTOM_FILE, JSON.stringify(toUpdateJSON))
119 120