[MediaWiki-commits] [Gerrit] Bring etherpad-lite configuration up to date with upstream - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Bring etherpad-lite configuration up to date with upstream
..
Bring etherpad-lite configuration up to date with upstream
Set all etherpad-lite configuration items as upstream. All of these are
imported straight from
https://github.com/ether/etherpad-lite/blob/develop/settings.json.template
and are the default values. etherpad-lite will just default to these
values if not specified.
We also remove sessionKey since it's unused these days and etherpad-lite
instead uses the SESSIONKEY.txt file for it
Change-Id: Ie1ecbade8f135c02ceb7d74824b7918024423b66
---
M modules/etherpad/templates/settings.json.erb
1 file changed, 38 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/etherpad/templates/settings.json.erb
b/modules/etherpad/templates/settings.json.erb
index 9bcb4f6..7b8611a 100644
--- a/modules/etherpad/templates/settings.json.erb
+++ b/modules/etherpad/templates/settings.json.erb
@@ -13,15 +13,52 @@
},
"defaultPadText": "",
- "sessionKey" : "",
+ "padOptions": {
+ "noColors": false,
+ "showControls": true,
+ "showChat": true,
+ "showLineNumbers": true,
+ "useMonospaceFont": false,
+ "userName": false,
+ "userColor": false,
+ "rtl": false,
+ "alwaysShowChat": false,
+ "chatAndUsers": false,
+ "lang": "en-gb"
+ },
+ "suppressErrorsInPadText" : false,
"requireSession" : false,
"editOnly" : false,
+ "sessionNoPassword" : false,
"minify": true,
"maxAge" : 21600, // 60 * 60 * 6 = 6 hours
"abiword": null,
+ "soffice": null,
+ "tidyHtml" : null,
+ "allowUnknownFileEnds" : false,
"requireAuthentication": false,
"requireAuthorization": false,
+ "trustProxy" : false,
+ "disableIPlogging" : false,
"socketTransportProtocols" : ["xhr-polling", "jsonp-polling",
"htmlfile"],
+ "loadTest": false,
+ "indentationOnNewLine": false,
+ "toolbar": {
+ "left": [
+ ["bold", "italic", "underline", "strikethrough"],
+ ["orderedlist", "unorderedlist", "indent", "outdent"],
+ ["undo", "redo"],
+ ["clearauthorship"]
+ ],
+ "right": [
+ ["importexport", "timeslider", "savedrevision"],
+ ["settings", "embed"],
+ ["showusers"]
+ ],
+ "timeslider": [
+ ["timeslider_export", "timeslider_returnToPad"]
+ ]
+ },
"loglevel": "INFO",
"logconfig" : {
"appenders": [
--
To view, visit https://gerrit.wikimedia.org/r/255402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1ecbade8f135c02ceb7d74824b7918024423b66
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bring etherpad-lite configuration up to date with upstream - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/255402
Change subject: Bring etherpad-lite configuration up to date with upstream
..
Bring etherpad-lite configuration up to date with upstream
Set all etherpad-lite configuration items as upstream. All of these are
imported straight from
https://github.com/ether/etherpad-lite/blob/develop/settings.json.template
and are the default values. etherpad-lite will just default to these
values if not specified.
We also remove sessionKey since it's unused these days and etherpad-lite
instead uses the SESSIONKEY.txt file for it
Change-Id: Ie1ecbade8f135c02ceb7d74824b7918024423b66
---
M modules/etherpad/templates/settings.json.erb
1 file changed, 38 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/255402/1
diff --git a/modules/etherpad/templates/settings.json.erb
b/modules/etherpad/templates/settings.json.erb
index 9bcb4f6..7b8611a 100644
--- a/modules/etherpad/templates/settings.json.erb
+++ b/modules/etherpad/templates/settings.json.erb
@@ -13,15 +13,52 @@
},
"defaultPadText": "",
- "sessionKey" : "",
+ "padOptions": {
+ "noColors": false,
+ "showControls": true,
+ "showChat": true,
+ "showLineNumbers": true,
+ "useMonospaceFont": false,
+ "userName": false,
+ "userColor": false,
+ "rtl": false,
+ "alwaysShowChat": false,
+ "chatAndUsers": false,
+ "lang": "en-gb"
+ },
+ "suppressErrorsInPadText" : false,
"requireSession" : false,
"editOnly" : false,
+ "sessionNoPassword" : false,
"minify": true,
"maxAge" : 21600, // 60 * 60 * 6 = 6 hours
"abiword": null,
+ "soffice": null,
+ "tidyHtml" : null,
+ "allowUnknownFileEnds" : false,
"requireAuthentication": false,
"requireAuthorization": false,
+ "trustProxy" : false,
+ "disableIPlogging" : false,
"socketTransportProtocols" : ["xhr-polling", "jsonp-polling",
"htmlfile"],
+ "loadTest": false,
+ "indentationOnNewLine": false,
+ "toolbar": {
+ "left": [
+ ["bold", "italic", "underline", "strikethrough"],
+ ["orderedlist", "unorderedlist", "indent", "outdent"],
+ ["undo", "redo"],
+ ["clearauthorship"]
+ ],
+ "right": [
+ ["importexport", "timeslider", "savedrevision"],
+ ["settings", "embed"],
+ ["showusers"]
+ ],
+ "timeslider": [
+ ["timeslider_export", "timeslider_returnToPad"]
+ ]
+ },
"loglevel": "INFO",
"logconfig" : {
"appenders": [
--
To view, visit https://gerrit.wikimedia.org/r/255402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1ecbade8f135c02ceb7d74824b7918024423b66
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
