Bläddra i källkod

Deprecate matrix_docker_network

pull/3093/head
Slavi Pantaleev 2 år sedan
förälder
incheckning
49066d41a9
3 ändrade filer med 1 tillägg och 8 borttagningar
  1. +0
    -3
      roles/custom/matrix-base/defaults/main.yml
  2. +0
    -5
      roles/custom/matrix-base/tasks/setup_matrix_base.yml
  3. +1
    -0
      roles/custom/matrix_playbook_migration/tasks/validate_config.yml

+ 0
- 3
roles/custom/matrix-base/defaults/main.yml Visa fil

@@ -177,9 +177,6 @@ matrix_identity_server_url: ~
matrix_integration_manager_rest_url: ~ matrix_integration_manager_rest_url: ~
matrix_integration_manager_ui_url: ~ matrix_integration_manager_ui_url: ~


# The Docker network that all services would be put into
matrix_docker_network: "matrix"

matrix_homeserver_container_extra_arguments_auto: [] matrix_homeserver_container_extra_arguments_auto: []
matrix_homeserver_app_service_config_files_auto: [] matrix_homeserver_app_service_config_files_auto: []




+ 0
- 5
roles/custom/matrix-base/tasks/setup_matrix_base.yml Visa fil

@@ -11,11 +11,6 @@
- "{{ matrix_base_data_path }}" - "{{ matrix_base_data_path }}"
- "{{ matrix_bin_path }}" - "{{ matrix_bin_path }}"


- name: Ensure Matrix network is created in Docker
community.docker.docker_network:
name: "{{ matrix_docker_network }}"
driver: bridge

- name: Ensure remove-all script created - name: Ensure remove-all script created
ansible.builtin.template: ansible.builtin.template:
src: "{{ role_path }}/templates/bin/remove-all.j2" src: "{{ role_path }}/templates/bin/remove-all.j2"


+ 1
- 0
roles/custom/matrix_playbook_migration/tasks/validate_config.yml Visa fil

@@ -134,6 +134,7 @@
- {'old': 'matrix_prometheus_services_proxy_connect_prometheus_node_exporter_matrix_nginx_proxy_not_enabled_proxy_pass_host', 'new': '<removed>'} - {'old': 'matrix_prometheus_services_proxy_connect_prometheus_node_exporter_matrix_nginx_proxy_not_enabled_proxy_pass_host', 'new': '<removed>'}
- {'old': 'matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_metrics_proxying_enabled', 'new': '<removed>'} - {'old': 'matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_metrics_proxying_enabled', 'new': '<removed>'}
- {'old': 'matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_matrix_nginx_proxy_not_enabled_proxy_pass_host', 'new': '<removed>'} - {'old': 'matrix_prometheus_services_proxy_connect_prometheus_postgres_exporter_matrix_nginx_proxy_not_enabled_proxy_pass_host', 'new': '<removed>'}
- {'old': 'matrix_docker_network', 'new': '<removed in favor of various other variables - matrix_addons_container_network, matrix_monitoring_container_network, matrix_homeserver_container_network, etc.>'}


- name: (Deprecation) Catch and report matrix_postgres variables - name: (Deprecation) Catch and report matrix_postgres variables
ansible.builtin.fail: ansible.builtin.fail:


Laddar…
Avbryt
Spara