Преглед на файлове

Merge pull request #679 from hgka/master

add variables for secure_backup_required and secure_backup_setup_methods
pull/684/head
Slavi Pantaleev преди 5 години
committed by GitHub
родител
ревизия
9e6d087224
No known key found for this signature in database GPG ключ ID: 4AEE18F83AFDEB23
променени са 2 файла, в които са добавени 15 реда и са изтрити 4 реда
  1. +10
    -0
      roles/matrix-base/defaults/main.yml
  2. +5
    -4
      roles/matrix-base/templates/static-files/well-known/matrix-client.j2

+ 10
- 0
roles/matrix-base/defaults/main.yml Целия файл

@@ -67,6 +67,16 @@ matrix_client_element_jitsi_preferredDomain: ''
# See: https://github.com/vector-im/element-web/blob/develop/docs/e2ee.md
matrix_client_element_e2ee_default: true

# Controls whether Element should require a secure backup set up before Element can be used.
# Setting this to true will update `/.well-known/matrix/client` and tell Element require a secure backup.
# See: https://github.com/vector-im/element-web/blob/develop/docs/e2ee.md
matrix_client_element_e2ee_secure_backup_required: false

# Controls which backup methods from ["key", "passphrase"] should be used, both is the default.
# Setting this to other then empty will update `/.well-known/matrix/client` and tell Element which method to use
# See: https://github.com/vector-im/element-web/blob/develop/docs/e2ee.md
matrix_client_element_e2ee_secure_backup_setup_methods: []

# The Docker network that all services would be put into
matrix_docker_network: "matrix"



+ 5
- 4
roles/matrix-base/templates/static-files/well-known/matrix-client.j2 Целия файл

@@ -26,12 +26,13 @@
"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
}
{% endif %}
{% if not matrix_client_element_e2ee_default %},
,
"io.element.e2ee": {
"default": false
"default": {{ matrix_client_element_e2ee_default|to_json }},
"secure_backup_required": {{ matrix_client_element_e2ee_secure_backup_required|to_json }},
"secure_backup_setup_methods": {{ matrix_client_element_e2ee_secure_backup_setup_methods|to_json }}
},
"im.vector.riot.e2ee": {
"default": false
"default": {{ matrix_client_element_e2ee_default|to_json }}
}
{% endif %}
}

Зареждане…
Отказ
Запис