mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-11-10 04:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'spantaleev:master' into fixgradle

Browse Source
This commit is contained in:
drelephant 2022-11-06 00:39:42 +11:00 committed by GitHub
commit 5642586820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/custom/matrix-etherpad/defaults/main.yml
View File

@ -58,6 +58,8 @@ matrix_etherpad_database_connection_string: 'postgres://{{ matrix_etherpad_datab
# Variables configuring the etherpad
matrix_etherpad_title: 'Etherpad'
matrix_etherpad_abiword: null
matrix_etherpad_soffice: null
matrix_etherpad_default_pad_text: |
Welcome to Etherpad!

6
roles/custom/matrix-etherpad/templates/settings.json.j2
View File

@ -20,8 +20,8 @@
"editOnly": false,
"minify": true,
"maxAge": 21600,
"abiword": null,
"soffice": null,
"abiword": {{ matrix_etherpad_abiword|to_json }},
"soffice": {{ matrix_etherpad_soffice|to_json }},
"tidyHtml": null,
"allowUnknownFileEnds": true,
"requireAuthentication": false,
@ -103,7 +103,7 @@
"pageUp": true,
"pageDown": true
},
"loglevel": "INFO",
"loglevel": "WARN",
"logconfig" :
{ "appenders": [
{ "type": "console",