Przeglądaj źródła

Fix docker_image option for ansible < 2.8

pull/187/head
Dan Arnfield 6 lat temu
rodzic
commit
9c23d877fe
16 zmienionych plików z 16 dodań i 16 usunięć
  1. +1
    -1
      roles/matrix-bridge-appservice-discord/tasks/setup_install.yml
  2. +1
    -1
      roles/matrix-bridge-appservice-irc/tasks/setup_install.yml
  3. +1
    -1
      roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
  4. +1
    -1
      roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
  5. +1
    -1
      roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml
  6. +1
    -1
      roles/matrix-corporal/tasks/setup_corporal.yml
  7. +1
    -1
      roles/matrix-coturn/tasks/setup_coturn.yml
  8. +1
    -1
      roles/matrix-dimension/tasks/setup_dimension.yml
  9. +1
    -1
      roles/matrix-mailer/tasks/setup_mailer.yml
  10. +1
    -1
      roles/matrix-mxisd/tasks/setup_mxisd.yml
  11. +1
    -1
      roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml
  12. +1
    -1
      roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_lets_encrypt.yml
  13. +1
    -1
      roles/matrix-postgres/tasks/setup_postgres.yml
  14. +1
    -1
      roles/matrix-riot-web/tasks/setup_riot_web.yml
  15. +1
    -1
      roles/matrix-synapse/tasks/goofys/setup_install.yml
  16. +1
    -1
      roles/matrix-synapse/tasks/synapse/setup_install.yml

+ 1
- 1
roles/matrix-bridge-appservice-discord/tasks/setup_install.yml Wyświetl plik

@@ -11,7 +11,7 @@
- name: Ensure Appservice Discord image is pulled
docker_image:
name: "{{ matrix_appservice_discord_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"

- name: Ensure Appservice Discord base directory exists
file:


+ 1
- 1
roles/matrix-bridge-appservice-irc/tasks/setup_install.yml Wyświetl plik

@@ -11,7 +11,7 @@
- name: Ensure Appservice IRC image is pulled
docker_image:
name: "{{ matrix_appservice_irc_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"

- name: Ensure Appservice IRC base directory exists
file:


+ 1
- 1
roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml Wyświetl plik

@@ -11,7 +11,7 @@
- name: Ensure Mautrix Facebook image is pulled
docker_image:
name: "{{ matrix_mautrix_facebook_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"

- name: Ensure Mautrix Facebook base directory exists
file:


+ 1
- 1
roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml Wyświetl plik

@@ -11,7 +11,7 @@
- name: Ensure Mautrix Telegram image is pulled
docker_image:
name: "{{ matrix_mautrix_telegram_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"

- name: Ensure Mautrix Telegram base directory exists
file:


+ 1
- 1
roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml Wyświetl plik

@@ -11,7 +11,7 @@
- name: Ensure Mautrix Whatsapp image is pulled
docker_image:
name: "{{ matrix_mautrix_whatsapp_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"

- name: Ensure Mautrix Whatsapp base directory exists
file:


+ 1
- 1
roles/matrix-corporal/tasks/setup_corporal.yml Wyświetl plik

@@ -20,7 +20,7 @@
- name: Ensure Matrix Corporal Docker image is pulled
docker_image:
name: "{{ matrix_corporal_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_corporal_enabled|bool

- name: Ensure Matrix Corporal config installed


+ 1
- 1
roles/matrix-coturn/tasks/setup_coturn.yml Wyświetl plik

@@ -7,7 +7,7 @@
- name: Ensure Coturn image is pulled
docker_image:
name: "{{ matrix_coturn_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_coturn_enabled|bool

- name: Ensure Coturn configuration path exists


+ 1
- 1
roles/matrix-dimension/tasks/setup_dimension.yml Wyświetl plik

@@ -25,7 +25,7 @@
- name: Ensure Dimension image is pulled
docker_image:
name: "{{ matrix_dimension_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_dimension_enabled|bool

- name: Ensure matrix-dimension.service installed


+ 1
- 1
roles/matrix-mailer/tasks/setup_mailer.yml Wyświetl plik

@@ -23,7 +23,7 @@
- name: Ensure mailer image is pulled
docker_image:
name: "{{ matrix_mailer_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_mailer_enabled|bool

- name: Ensure matrix-mailer.service installed


+ 1
- 1
roles/matrix-mxisd/tasks/setup_mxisd.yml Wyświetl plik

@@ -19,7 +19,7 @@
- name: Ensure mxisd image is pulled
docker_image:
name: "{{ matrix_mxisd_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_mxisd_enabled|bool

- name: Ensure mxisd config installed


+ 1
- 1
roles/matrix-nginx-proxy/tasks/setup_nginx_proxy.yml Wyświetl plik

@@ -97,7 +97,7 @@
- name: Ensure nginx Docker image is pulled
docker_image:
name: "{{ matrix_nginx_proxy_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_nginx_proxy_enabled|bool

- name: Ensure matrix-nginx-proxy.service installed


+ 1
- 1
roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_lets_encrypt.yml Wyświetl plik

@@ -36,7 +36,7 @@
- name: Ensure certbot Docker image is pulled
docker_image:
name: "{{ matrix_ssl_lets_encrypt_certbot_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: "matrix_ssl_retrieval_method == 'lets-encrypt'"

- name: Obtain Let's Encrypt certificates


+ 1
- 1
roles/matrix-postgres/tasks/setup_postgres.yml Wyświetl plik

@@ -27,7 +27,7 @@
- name: Ensure postgres Docker image is pulled
docker_image:
name: "{{ matrix_postgres_docker_image_to_use }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_postgres_enabled|bool

# We always create these directories, even if an external Postgres is used,


+ 1
- 1
roles/matrix-riot-web/tasks/setup_riot_web.yml Wyświetl plik

@@ -16,7 +16,7 @@
- name: Ensure riot-web Docker image is pulled
docker_image:
name: "{{ matrix_riot_web_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
when: matrix_riot_web_enabled|bool

- name: Ensure Matrix riot-web config files installed


+ 1
- 1
roles/matrix-synapse/tasks/goofys/setup_install.yml Wyświetl plik

@@ -1,7 +1,7 @@
- name: Ensure Goofys Docker image is pulled
docker_image:
name: "{{ matrix_s3_goofys_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"

# This will throw a Permission Denied error if already mounted
- name: Check Matrix Goofys external storage mountpoint path


+ 1
- 1
roles/matrix-synapse/tasks/synapse/setup_install.yml Wyświetl plik

@@ -21,7 +21,7 @@
- name: Ensure Synapse Docker image is pulled
docker_image:
name: "{{ matrix_synapse_docker_image }}"
source: "pull"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"

- name: Check if a Synapse signing key exists
stat:


Ładowanie…
Anuluj
Zapisz