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

Merge pull request #1018 from GoMatrixHosting/master

GoMatrixHosting v0.4.3
pull/1019/head
Slavi Pantaleev 4 лет назад
committed by GitHub
Родитель
Сommit
72a7cb4145
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
4 измененных файлов: 20 добавлений и 3 удалений
  1. +2
    -2
      roles/matrix-awx/surveys/configure_synapse.json.j2
  2. +9
    -0
      roles/matrix-awx/tasks/main.yml
  3. +8
    -0
      roles/matrix-awx/tasks/rename_variables.yml
  4. +1
    -1
      roles/matrix-awx/tasks/set_variables_synapse.yml

+ 2
- 2
roles/matrix-awx/surveys/configure_synapse.json.j2 Просмотреть файл

@@ -56,10 +56,10 @@
"required": false, "required": false,
"min": null, "min": null,
"max": null, "max": null,
"default": "{{ matrix_synapse_use_presence | string | lower }}",
"default": "{{ matrix_synapse_presence_enabled | string | lower }}",
"choices": "true\nfalse", "choices": "true\nfalse",
"new_question": true, "new_question": true,
"variable": "matrix_synapse_use_presence",
"variable": "matrix_synapse_presence_enabled",
"type": "multiplechoice" "type": "multiplechoice"
}, },
{ {


+ 9
- 0
roles/matrix-awx/tasks/main.yml Просмотреть файл

@@ -8,6 +8,15 @@
tags: tags:
- always - always


# Renames the variables if needed
- include_tasks:
file: "rename_variables.yml"
apply:
tags: always
when: run_setup|bool and matrix_awx_enabled|bool
tags:
- always

# Perform a backup of the server # Perform a backup of the server
- include_tasks: - include_tasks:
file: "backup_server.yml" file: "backup_server.yml"


+ 8
- 0
roles/matrix-awx/tasks/rename_variables.yml Просмотреть файл

@@ -0,0 +1,8 @@

- name: Rename synapse presence variable
delegate_to: 127.0.0.1
replace:
path: "/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml"
regexp: 'matrix_synapse_use_presence'
replace: 'matrix_synapse_presence_enabled'


+ 1
- 1
roles/matrix-awx/tasks/set_variables_synapse.yml Просмотреть файл

@@ -21,7 +21,7 @@
'matrix_synapse_enable_registration': '{{ matrix_synapse_enable_registration }}' 'matrix_synapse_enable_registration': '{{ matrix_synapse_enable_registration }}'
'matrix_synapse_federation_enabled': '{{ matrix_synapse_federation_enabled }}' 'matrix_synapse_federation_enabled': '{{ matrix_synapse_federation_enabled }}'
'matrix_synapse_enable_group_creation': '{{ matrix_synapse_enable_group_creation }}' 'matrix_synapse_enable_group_creation': '{{ matrix_synapse_enable_group_creation }}'
'matrix_synapse_use_presence': '{{ matrix_synapse_use_presence }}'
'matrix_synapse_presence_enabled': '{{ matrix_synapse_presence_enabled }}'
'matrix_synapse_max_upload_size_mb': '{{ matrix_synapse_max_upload_size_mb }}' 'matrix_synapse_max_upload_size_mb': '{{ matrix_synapse_max_upload_size_mb }}'
'matrix_synapse_url_preview_enabled': '{{ matrix_synapse_url_preview_enabled }}' 'matrix_synapse_url_preview_enabled': '{{ matrix_synapse_url_preview_enabled }}'
'matrix_synapse_allow_guest_access': '{{ matrix_synapse_allow_guest_access }}' 'matrix_synapse_allow_guest_access': '{{ matrix_synapse_allow_guest_access }}'


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