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

Split `matrix_client_fluffychat_container_additional_networks` into `_auto` and `_custom`

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/4068
pull/4074/head
Slavi Pantaleev 1 год назад
Родитель
Сommit
d6c60fd538
2 измененных файлов: 4 добавлений и 2 удалений
  1. +1
    -1
      group_vars/matrix_servers
  2. +3
    -1
      roles/custom/matrix-client-fluffychat/defaults/main.yml

+ 1
- 1
group_vars/matrix_servers Просмотреть файл

@@ -4542,7 +4542,7 @@ matrix_client_fluffychat_container_http_host_bind_port: "{{ (matrix_playbook_ser


matrix_client_fluffychat_container_network: "{{ matrix_addons_container_network }}" matrix_client_fluffychat_container_network: "{{ matrix_addons_container_network }}"


matrix_client_fluffychat_container_additional_networks: "{{ [matrix_playbook_reverse_proxyable_services_additional_network] if (matrix_client_fluffychat_container_labels_traefik_enabled and matrix_playbook_reverse_proxyable_services_additional_network) else [] }}"
matrix_client_fluffychat_container_additional_networks_auto: "{{ [matrix_playbook_reverse_proxyable_services_additional_network] if (matrix_client_fluffychat_container_labels_traefik_enabled and matrix_playbook_reverse_proxyable_services_additional_network) else [] }}"


matrix_client_fluffychat_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}" matrix_client_fluffychat_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}"
matrix_client_fluffychat_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" matrix_client_fluffychat_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}"


+ 3
- 1
roles/custom/matrix-client-fluffychat/defaults/main.yml Просмотреть файл

@@ -22,7 +22,9 @@ matrix_client_fluffychat_container_network: ''
# A list of additional container networks that the container would be connected to. # A list of additional container networks that the container would be connected to.
# The role does not create these networks, so make sure they already exist. # The role does not create these networks, so make sure they already exist.
# Use this to expose this container to a reverse proxy, which runs in a different container network. # Use this to expose this container to a reverse proxy, which runs in a different container network.
matrix_client_fluffychat_container_additional_networks: []
matrix_client_fluffychat_container_additional_networks: "{{ matrix_client_fluffychat_container_additional_networks_auto + matrix_client_fluffychat_container_additional_networks_custom }}"
matrix_client_fluffychat_container_additional_networks_auto: []
matrix_client_fluffychat_container_additional_networks_custom: []


# Controls whether the matrix-client-fluffychat container exposes its HTTP port (tcp/8080 in the container). # Controls whether the matrix-client-fluffychat container exposes its HTTP port (tcp/8080 in the container).
# #


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