Explorar el Código

Make .log.config modifications respect whitespace

A `.log.config` file may be generated with a different
level of indentation depending on which (Docker image, etc.)
generates it.

With this patch, we tolerate different levels of indentation
(2 spaces, 4 spaces, etc.) and don't break the configuration.
pull/6/head
Slavi Pantaleev hace 7 años
padre
commit
3af3ef48fc
Se han modificado 1 ficheros con 4 adiciones y 3 borrados
  1. +4
    -3
      roles/matrix-server/tasks/setup_synapse.yml

+ 4
- 3
roles/matrix-server/tasks/setup_synapse.yml Ver fichero

@@ -61,10 +61,11 @@
args:
regexp: "{{ item.regexp }}"
line: '{{ item.line }}'
backrefs: '{{ item.backrefs }}'
with_items:
- {"regexp": "^ filename:", "line": ' filename: /matrix-run/homeserver.log'}
- {"regexp": "^ maxBytes:", "line": ' maxBytes: {{ matrix_max_log_file_size_mb * 1024 * 1024 }}'}
- {"regexp": "^ backupCount:", "line": ' backupCount: {{ matrix_max_log_files_count }}'}
- {"regexp": '^(\s+)filename:', "line": '\1filename: /matrix-run/homeserver.log', backrefs: yes}
- {"regexp": '^(\s+)maxBytes:', "line": '\1maxBytes: {{ matrix_max_log_file_size_mb * 1024 * 1024 }}', backrefs: yes}
- {"regexp": '^(\s+)backupCount:', "line": '\1backupCount: {{ matrix_max_log_files_count }}', backrefs: yes}

- name: Augment Matrix config
lineinfile: "dest={{ matrix_synapse_config_dir_path }}/homeserver.yaml"


Cargando…
Cancelar
Guardar