Merge pull request #2233 from etkecc/etherpad-soffice-option
etherpad: add abiword and soffice config options, update log level
This commit is contained in:
commit
5fdcead744
@ -58,6 +58,8 @@ matrix_etherpad_database_connection_string: 'postgres://{{ matrix_etherpad_datab
|
|||||||
|
|
||||||
# Variables configuring the etherpad
|
# Variables configuring the etherpad
|
||||||
matrix_etherpad_title: 'Etherpad'
|
matrix_etherpad_title: 'Etherpad'
|
||||||
|
matrix_etherpad_abiword: null
|
||||||
|
matrix_etherpad_soffice: null
|
||||||
matrix_etherpad_default_pad_text: |
|
matrix_etherpad_default_pad_text: |
|
||||||
Welcome to Etherpad!
|
Welcome to Etherpad!
|
||||||
|
|
||||||
|
@ -20,8 +20,8 @@
|
|||||||
"editOnly": false,
|
"editOnly": false,
|
||||||
"minify": true,
|
"minify": true,
|
||||||
"maxAge": 21600,
|
"maxAge": 21600,
|
||||||
"abiword": null,
|
"abiword": {{ matrix_etherpad_abiword|to_json }},
|
||||||
"soffice": null,
|
"soffice": {{ matrix_etherpad_soffice|to_json }},
|
||||||
"tidyHtml": null,
|
"tidyHtml": null,
|
||||||
"allowUnknownFileEnds": true,
|
"allowUnknownFileEnds": true,
|
||||||
"requireAuthentication": false,
|
"requireAuthentication": false,
|
||||||
@ -103,7 +103,7 @@
|
|||||||
"pageUp": true,
|
"pageUp": true,
|
||||||
"pageDown": true
|
"pageDown": true
|
||||||
},
|
},
|
||||||
"loglevel": "INFO",
|
"loglevel": "WARN",
|
||||||
"logconfig" :
|
"logconfig" :
|
||||||
{ "appenders": [
|
{ "appenders": [
|
||||||
{ "type": "console",
|
{ "type": "console",
|
||||||
|
Loading…
Reference in New Issue
Block a user