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

Move some things around

pull/740/head
Slavi Pantaleev 5 лет назад
Родитель
Сommit
a3406a182b
2 измененных файлов: 9 добавлений и 10 удалений
  1. +1
    -1
      roles/matrix-bridge-mautrix-facebook/defaults/main.yml
  2. +8
    -9
      roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml

+ 1
- 1
roles/matrix-bridge-mautrix-facebook/defaults/main.yml Просмотреть файл

@@ -33,7 +33,6 @@ matrix_mautrix_facebook_appservice_token: ''
matrix_mautrix_facebook_homeserver_token: ''



# Database-related configuration fields.
#
# To use SQLite, stick to these defaults.
@@ -61,6 +60,7 @@ matrix_mautrix_facebook_appservice_database: "{{
}[matrix_mautrix_facebook_database_engine]
}}"


# Can be set to enable automatic double-puppeting via Shared Secret Auth (https://github.com/devture/matrix-synapse-shared-secret-auth).
matrix_mautrix_facebook_login_shared_secret: ''



+ 8
- 9
roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml Просмотреть файл

@@ -1,5 +1,13 @@
---

# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
fail:
msg: >-
The matrix-bridge-mautrix-facebook role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed|default(False)"

- block:
- name: Check if an SQLite database already exists
stat:
@@ -20,15 +28,6 @@
when: "matrix_mautrix_facebook_sqlite_database_path_local_stat_result.stat.exists"
when: "matrix_mautrix_facebook_database_engine == 'postgres'"


# If the matrix-synapse role is not used, `matrix_synapse_role_executed` won't exist.
# We don't want to fail in such cases.
- name: Fail if matrix-synapse role already executed
fail:
msg: >-
The matrix-bridge-mautrix-facebook role needs to execute before the matrix-synapse role.
when: "matrix_synapse_role_executed|default(False)"

- name: Ensure Mautrix Facebook image is pulled
docker_image:
name: "{{ matrix_mautrix_facebook_docker_image }}"


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