From 4316bbee6e9e40ba537eddaa74228c4df3a84115 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 27 Apr 2020 23:04:24 +0200
Subject: [PATCH] [Etherpad] Fix bad syntax in settings.json
---
pica-etherpad/settings.json | 43 +++++++++++++++++--------------------
1 file changed, 20 insertions(+), 23 deletions(-)
diff --git a/pica-etherpad/settings.json b/pica-etherpad/settings.json
index c68742b1..61908ad7 100644
--- a/pica-etherpad/settings.json
+++ b/pica-etherpad/settings.json
@@ -30,36 +30,36 @@
"lang": "${PAD_OPTIONS_LANG:fr}"
},
"padShortcutEnabled": {
- "altF9": "${PAD_SHORTCUTS_ENABLED_ALT_F9:true}", /* focus on the File Menu and/or editbar */
- "altC": "${PAD_SHORTCUTS_ENABLED_ALT_C:true}", /* focus on the Chat window */
- "cmdShift2": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_2:true}", /* shows a gritter popup showing a line author */
+ "altF9": "${PAD_SHORTCUTS_ENABLED_ALT_F9:true}",
+ "altC": "${PAD_SHORTCUTS_ENABLED_ALT_C:true}",
+ "cmdShift2": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_2:true}",
"delete": "${PAD_SHORTCUTS_ENABLED_DELETE:true}",
"return": "${PAD_SHORTCUTS_ENABLED_RETURN:true}",
- "esc": "${PAD_SHORTCUTS_ENABLED_ESC:true}", /* in mozilla versions 14-19 avoid reconnecting pad */
- "cmdS": "${PAD_SHORTCUTS_ENABLED_CMD_S:true}", /* save a revision */
- "tab": "${PAD_SHORTCUTS_ENABLED_TAB:true}", /* indent */
- "cmdZ": "${PAD_SHORTCUTS_ENABLED_CMD_Z:true}", /* undo/redo */
- "cmdY": "${PAD_SHORTCUTS_ENABLED_CMD_Y:true}", /* redo */
- "cmdI": "${PAD_SHORTCUTS_ENABLED_CMD_I:true}", /* italic */
- "cmdB": "${PAD_SHORTCUTS_ENABLED_CMD_B:true}", /* bold */
- "cmdU": "${PAD_SHORTCUTS_ENABLED_CMD_U:true}", /* underline */
- "cmd5": "${PAD_SHORTCUTS_ENABLED_CMD_5:true}", /* strike through */
- "cmdShiftL": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_L:true}", /* unordered list */
- "cmdShiftN": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_N:true}", /* ordered list */
- "cmdShift1": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_1:true}", /* ordered list */
- "cmdShiftC": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_C:true}", /* clear authorship */
- "cmdH": "${PAD_SHORTCUTS_ENABLED_CMD_H:true}", /* backspace */
- "ctrlHome": "${PAD_SHORTCUTS_ENABLED_CTRL_HOME:true}", /* scroll to top of pad */
+ "esc": "${PAD_SHORTCUTS_ENABLED_ESC:true}",
+ "cmdS": "${PAD_SHORTCUTS_ENABLED_CMD_S:true}",
+ "tab": "${PAD_SHORTCUTS_ENABLED_TAB:true}",
+ "cmdZ": "${PAD_SHORTCUTS_ENABLED_CMD_Z:true}",
+ "cmdY": "${PAD_SHORTCUTS_ENABLED_CMD_Y:true}",
+ "cmdI": "${PAD_SHORTCUTS_ENABLED_CMD_I:true}",
+ "cmdB": "${PAD_SHORTCUTS_ENABLED_CMD_B:true}",
+ "cmdU": "${PAD_SHORTCUTS_ENABLED_CMD_U:true}",
+ "cmd5": "${PAD_SHORTCUTS_ENABLED_CMD_5:true}",
+ "cmdShiftL": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_L:true}",
+ "cmdShiftN": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_N:true}",
+ "cmdShift1": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_1:true}",
+ "cmdShiftC": "${PAD_SHORTCUTS_ENABLED_CMD_SHIFT_C:true}",
+ "cmdH": "${PAD_SHORTCUTS_ENABLED_CMD_H:true}",
+ "ctrlHome": "${PAD_SHORTCUTS_ENABLED_CTRL_HOME:true}",
"pageUp": "${PAD_SHORTCUTS_ENABLED_PAGE_UP:true}",
"pageDown": "${PAD_SHORTCUTS_ENABLED_PAGE_DOWN:true}"
},
- "suppressErrorsInPadText": "${SUPPRESS_ERRORS_IN_PAD_TEXT:false}",,
+ "suppressErrorsInPadText": "${SUPPRESS_ERRORS_IN_PAD_TEXT:false}",
"requireSession": "${REQUIRE_SESSION:false}",
"editOnly": "${EDIT_ONLY:false}",
"sessionNoPassword": "${SESSION_NO_PASSWORD:false}",
"minify": "${MINIFY:true}",
- "maxAge": "${MAX_AGE:21600}", // 60 * 60 * 6 = 6 hours
+ "maxAge": "${MAX_AGE:21600}",
"abiword": "${ABIWORD}",
"soffice": "${SOFFICE}",
"tidyHtml": "${TIDY_HTML}",
@@ -88,10 +88,7 @@
"loadTest": "${LOAD_TEST:false}",
"indentationOnNewLine": false,
"importExportRateLimiting": {
- // duration of the rate limit window (milliseconds)
"windowMs": "${IMPORT_EXPORT_RATE_LIMIT_WINDOW:90000}",
-
- // maximum number of requests per IP to allow during the rate limit window
"max": "${IMPORT_EXPORT_MAX_REQ_PER_IP:10}"
},
"importMaxFileSize": "${IMPORT_MAX_FILE_SIZE:52428800}", // 50 * 1024 * 1024
--
GitLab