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

Remove possible template parsing conflicts and revert installation script

pull/5289/head
jasonlaguidice 5 дней назад
Родитель
Сommit
c4a2d93990
2 измененных файлов: 4 добавлений и 14 удалений
  1. +1
    -12
      roles/custom/matrix-bridge-rustpush/tasks/setup_install.yml
  2. +3
    -2
      roles/custom/matrix-bridge-rustpush/templates/config.yaml.j2

+ 1
- 12
roles/custom/matrix-bridge-rustpush/tasks/setup_install.yml Просмотреть файл

@@ -65,22 +65,11 @@


- name: Ensure rustpush-bridge config.yaml installed - name: Ensure rustpush-bridge config.yaml installed
ansible.builtin.copy: ansible.builtin.copy:
content: >-
{{
matrix_rustpush_bridge_configuration
| combine({
'network': {
'displayname_template': matrix_rustpush_bridge_network_displayname_template_effective,
},
}, recursive=True)
| to_nice_yaml(indent=2, width=999999)
}}
content: "{{ matrix_rustpush_bridge_configuration | to_nice_yaml(indent=2, width=999999) }}"
dest: "{{ matrix_rustpush_bridge_config_path }}/config.yaml" dest: "{{ matrix_rustpush_bridge_config_path }}/config.yaml"
mode: 0644 mode: 0644
owner: "{{ matrix_user_name }}" owner: "{{ matrix_user_name }}"
group: "{{ matrix_group_name }}" group: "{{ matrix_group_name }}"
vars:
matrix_rustpush_bridge_network_displayname_template_effective: "{{ (matrix_rustpush_bridge_configuration.network | default({}, true)).displayname_template | default(matrix_rustpush_bridge_network_displayname_template) }}"
register: matrix_rustpush_bridge_config_result register: matrix_rustpush_bridge_config_result


- name: Ensure rustpush-bridge registration.yaml installed - name: Ensure rustpush-bridge registration.yaml installed


+ 3
- 2
roles/custom/matrix-bridge-rustpush/templates/config.yaml.j2 Просмотреть файл

@@ -2,8 +2,9 @@
# Network-specific config options (iMessage via RustPush) # Network-specific config options (iMessage via RustPush)
network: network:
# Displayname template for iMessage contacts. # Displayname template for iMessage contacts.
# Available variables: {% raw %}{{.FirstName}}, {{.LastName}}, {{.Nickname}},
# {{.Phone}}, {{.Email}}, {{.ID}}{% endraw %}
# Available variables:
# .FirstName, .LastName, .Nickname
# .Phone, .Email, .ID
displayname_template: {{ matrix_rustpush_bridge_network_displayname_template | to_json }} displayname_template: {{ matrix_rustpush_bridge_network_displayname_template | to_json }}


# How many days back to look for chats during initial sync. # How many days back to look for chats during initial sync.


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