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

Merge branch 'master' into traefik

pull/2464/head
Slavi Pantaleev 3 лет назад
Родитель
Сommit
3f2cb840b9
3 измененных файлов: 3 добавлений и 3 удалений
  1. +1
    -1
      roles/custom/matrix-client-hydrogen/defaults/main.yml
  2. +1
    -1
      roles/custom/matrix-user-verification-service/defaults/main.yml
  3. +1
    -1
      roles/custom/matrix-user-verification-service/tasks/main.yml

+ 1
- 1
roles/custom/matrix-client-hydrogen/defaults/main.yml Просмотреть файл

@@ -6,7 +6,7 @@ matrix_client_hydrogen_enabled: true
matrix_client_hydrogen_container_image_self_build: false matrix_client_hydrogen_container_image_self_build: false
matrix_client_hydrogen_container_image_self_build_repo: "https://github.com/vector-im/hydrogen-web.git" matrix_client_hydrogen_container_image_self_build_repo: "https://github.com/vector-im/hydrogen-web.git"


matrix_client_hydrogen_version: v0.3.6
matrix_client_hydrogen_version: v0.3.7
matrix_client_hydrogen_docker_image: "{{ matrix_client_hydrogen_docker_image_name_prefix }}vector-im/hydrogen-web:{{ matrix_client_hydrogen_version }}" matrix_client_hydrogen_docker_image: "{{ matrix_client_hydrogen_docker_image_name_prefix }}vector-im/hydrogen-web:{{ matrix_client_hydrogen_version }}"
matrix_client_hydrogen_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_hydrogen_container_image_self_build else 'ghcr.io/' }}" matrix_client_hydrogen_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_hydrogen_container_image_self_build else 'ghcr.io/' }}"
matrix_client_hydrogen_docker_image_force_pull: "{{ matrix_client_hydrogen_docker_image.endswith(':latest') }}" matrix_client_hydrogen_docker_image_force_pull: "{{ matrix_client_hydrogen_docker_image.endswith(':latest') }}"


+ 1
- 1
roles/custom/matrix-user-verification-service/defaults/main.yml Просмотреть файл

@@ -32,7 +32,7 @@ matrix_user_verification_service_systemd_service_name: "{{ matrix_user_verificat
## REQUIRED ## REQUIRED


# Homeserver client API admin token (synapse only)- Required for the service to verify room membership # Homeserver client API admin token (synapse only)- Required for the service to verify room membership
# matrix_user_verification_service_uvs_access_token:
matrix_user_verification_service_uvs_access_token: ''


# homeserver client api url # homeserver client api url
matrix_user_verification_service_uvs_homeserver_url: "{{ matrix_homeserver_container_url }}" matrix_user_verification_service_uvs_homeserver_url: "{{ matrix_homeserver_container_url }}"


+ 1
- 1
roles/custom/matrix-user-verification-service/tasks/main.yml Просмотреть файл

@@ -1,7 +1,7 @@
--- ---


- block: - block:
- when: matrix_jitsi_enabled | bool
- when: run_setup | bool and matrix_user_verification_service_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml" ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
- when: run_setup | bool and matrix_user_verification_service_enabled | bool - when: run_setup | bool and matrix_user_verification_service_enabled | bool
ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml" ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"


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