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

rename hookshot *.yaml to *.yml

pull/1505/head
HarHarLinks 4 лет назад
Родитель
Сommit
f12cad7a7b
2 измененных файлов: 6 добавлений и 6 удалений
  1. +2
    -2
      roles/matrix-bridge-hookshot/tasks/init.yml
  2. +4
    -4
      roles/matrix-bridge-hookshot/tasks/setup_install.yml

+ 2
- 2
roles/matrix-bridge-hookshot/tasks/init.yml Просмотреть файл

@@ -15,12 +15,12 @@
matrix_synapse_container_extra_arguments: >
{{ matrix_synapse_container_extra_arguments|default([]) }}
+
["--mount type=bind,src={{ matrix_hookshot_base_path }}/registration.yaml,dst=/hookshot-registration.yaml,ro"]
["--mount type=bind,src={{ matrix_hookshot_base_path }}/registration.yml,dst=/hookshot-registration.yml,ro"]

matrix_synapse_app_service_config_files: >
{{ matrix_synapse_app_service_config_files|default([]) }}
+
{{ ["/hookshot-registration.yaml"] }}
{{ ["/hookshot-registration.yml"] }}
when: matrix_hookshot_enabled|bool

- block:


+ 4
- 4
roles/matrix-bridge-hookshot/tasks/setup_install.yml Просмотреть файл

@@ -31,10 +31,10 @@
become_user: "{{ matrix_user_username }}"
when: "not hookshot_passkey_file.stat.exists"

- name: Ensure hookshot config.yaml installed if provided
- name: Ensure hookshot config.yml installed if provided
copy:
content: "{{ matrix_hookshot_configuration|to_nice_yaml }}"
dest: "{{ matrix_hookshot_base_path }}/config.yaml"
dest: "{{ matrix_hookshot_base_path }}/config.yml"
mode: 0644
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
@@ -55,10 +55,10 @@
msg: "Your hookshot configuration did not pass validation:\n{{ hookshot_config_validation_result.stdout }}\n{{ hookshot_config_validation_result.stderr }}"
when: "hookshot_config_validation_result.rc > 0"

- name: Ensure hookshot registration.yaml installed if provided
- name: Ensure hookshot registration.yml installed if provided
copy:
content: "{{ matrix_hookshot_registration|to_nice_yaml }}"
dest: "{{ matrix_hookshot_base_path }}/registration.yaml"
dest: "{{ matrix_hookshot_base_path }}/registration.yml"
mode: 0644
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"


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