Просмотр исходного кода

matrix-etherpad: fail when mode is 'dimension', but dimension is disabled

pull/2229/head
Aine 3 лет назад
Родитель
Сommit
39e4b419dd
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 34969C908CCA2804
2 измененных файлов: 11 добавлений и 5 удалений
  1. +5
    -5
      roles/custom/matrix-etherpad/tasks/main.yml
  2. +6
    -0
      roles/custom/matrix-etherpad/tasks/validate_config.yml

+ 5
- 5
roles/custom/matrix-etherpad/tasks/main.yml Просмотреть файл

@@ -4,20 +4,20 @@
tags:
- always

- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_install.yml"
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
when: run_setup | bool and matrix_etherpad_enabled | bool
tags:
- setup-all
- setup-etherpad

- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
when: run_setup | bool and not matrix_etherpad_enabled | bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_install.yml"
when: run_setup | bool and matrix_etherpad_enabled | bool
tags:
- setup-all
- setup-etherpad

- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
when: run_setup | bool and matrix_etherpad_enabled | bool
- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
when: run_setup | bool and not matrix_etherpad_enabled | bool
tags:
- setup-all
- setup-etherpad

+ 6
- 0
roles/custom/matrix-etherpad/tasks/validate_config.yml Просмотреть файл

@@ -5,3 +5,9 @@
msg: >-
Etherpad requires a dedicated Postgres database. Please enable the built in one, or configure an external DB by redefining "matrix_etherpad_database_hostname"
when: matrix_etherpad_database_hostname == "matrix-postgres" and not matrix_postgres_enabled

- name: Fail if wrong mode selected
ansible.builtin.fail:
msg: >-
You're using Etherpad in 'dimension' mode (`matrix_etherpad_serving_mode: dimension`), which tries to host Etherpad at the Dimension subdomain - `{{ matrix_server_fqn_dimension }}`. However, this isn't possible because Dimension is not enabled. To resolve the problem, either enable Dimension (`matrix_dimension_enabled: true`) or switch Etherpad to standalone mode (`matrix_etherpad_mode: standalone`) and have it served on its own domain (`{{ matrix_server_fqn_etherpad }}`).
when: matrix_etherpad_enabled | bool and matrix_etherpad_mode == 'dimension' and not matrix_dimension_enabled | default(False) | bool

Загрузка…
Отмена
Сохранить