Explorar el Código

Merge pull request #942 from pushytoxin/etherpad1_8_12

Upgrade Etherpad (1.8.7 -> 1.8.12)
pull/944/head
Slavi Pantaleev hace 5 años
committed by GitHub
padre
commit
97c0bf1a73
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: 4AEE18F83AFDEB23
Se han modificado 3 ficheros con 5 adiciones y 2 borrados
  1. +1
    -1
      roles/matrix-etherpad/defaults/main.yml
  2. +3
    -0
      roles/matrix-etherpad/templates/settings.json.j2
  3. +1
    -1
      roles/matrix-etherpad/templates/systemd/matrix-etherpad.service.j2

+ 1
- 1
roles/matrix-etherpad/defaults/main.yml Ver fichero

@@ -2,7 +2,7 @@ matrix_etherpad_enabled: false


matrix_etherpad_base_path: "{{ matrix_base_data_path }}/etherpad" matrix_etherpad_base_path: "{{ matrix_base_data_path }}/etherpad"


matrix_etherpad_version: 1.8.7
matrix_etherpad_version: 1.8.12
matrix_etherpad_docker_image: "docker.io/etherpad/etherpad:{{ matrix_etherpad_version }}" matrix_etherpad_docker_image: "docker.io/etherpad/etherpad:{{ matrix_etherpad_version }}"
matrix_etherpad_docker_image_force_pull: "{{ matrix_etherpad_docker_image.endswith(':latest') }}" matrix_etherpad_docker_image_force_pull: "{{ matrix_etherpad_docker_image.endswith(':latest') }}"




+ 3
- 0
roles/matrix-etherpad/templates/settings.json.j2 Ver fichero

@@ -42,6 +42,9 @@
"percentageToScrollWhenUserPressesArrowUp": 0 "percentageToScrollWhenUserPressesArrowUp": 0
}, },
"socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"], "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
"socketIo": {
"maxHttpBufferSize": 10000
},
"loadTest": false, "loadTest": false,
"importExportRateLimiting": { "importExportRateLimiting": {
"windowMs": 90000, "windowMs": 90000,


+ 1
- 1
roles/matrix-etherpad/templates/systemd/matrix-etherpad.service.j2 Ver fichero

@@ -29,7 +29,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-etherpad \
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}
{{ matrix_etherpad_docker_image }} \ {{ matrix_etherpad_docker_image }} \
node --experimental-worker /opt/etherpad-lite/node_modules/ep_etherpad-lite/node/server.js \
node --experimental-worker src/node/server.js \
--settings /data/settings.json --credentials /data/credentials.json \ --settings /data/settings.json --credentials /data/credentials.json \
--sessionkey /data/sessionkey.json --apikey /data/apijey.json --sessionkey /data/sessionkey.json --apikey /data/apijey.json


Cargando…
Cancelar
Guardar