From 300e67c03dfc06a4b862e6db3034740432fcb101 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 9 Jan 2024 11:51:15 +0200 Subject: [PATCH] Split matrix_ldap_registration_proxy_systemd_wanted_services_list and update docs a bit --- docs/configuring-playbook-matrix-ldap-registration-proxy.md | 6 ++++++ .../custom/matrix-ldap-registration-proxy/defaults/main.yml | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/configuring-playbook-matrix-ldap-registration-proxy.md b/docs/configuring-playbook-matrix-ldap-registration-proxy.md index 16e0641e7..3768e3dd5 100644 --- a/docs/configuring-playbook-matrix-ldap-registration-proxy.md +++ b/docs/configuring-playbook-matrix-ldap-registration-proxy.md @@ -29,5 +29,11 @@ matrix_ldap_registration_proxy_ldap_uri: "{{ matrix_synapse_ext_password_provide matrix_ldap_registration_proxy_ldap_base_dn: "{{ matrix_synapse_ext_password_provider_ldap_base }}" matrix_ldap_registration_proxy_ldap_user: "{{ matrix_synapse_ext_password_provider_ldap_bind_dn }}" matrix_ldap_registration_proxy_ldap_password: "{{ matrix_synapse_ext_password_provider_ldap_bind_password }}" + +matrix_ldap_registration_proxy_container_additional_networks_custom: + - "{{ matrix_synapse_container_network }}" + +matrix_ldap_registration_proxy_systemd_wanted_services_list_custom: + - matrix-synapse.service ``` diff --git a/roles/custom/matrix-ldap-registration-proxy/defaults/main.yml b/roles/custom/matrix-ldap-registration-proxy/defaults/main.yml index 8aced9ce0..966f46529 100644 --- a/roles/custom/matrix-ldap-registration-proxy/defaults/main.yml +++ b/roles/custom/matrix-ldap-registration-proxy/defaults/main.yml @@ -78,7 +78,10 @@ matrix_ldap_registration_proxy_systemd_required_services_list_auto: [] matrix_ldap_registration_proxy_systemd_required_services_list_custom: [] # List of systemd services that matrix-ldap-registration-proxy.service wants -matrix_ldap_registration_proxy_systemd_wanted_services_list: [] +matrix_ldap_registration_proxy_systemd_wanted_services_list: "{{ matrix_ldap_registration_proxy_systemd_wanted_services_list_default + matrix_ldap_registration_proxy_systemd_wanted_services_list_auto + matrix_ldap_registration_proxy_systemd_wanted_services_list_custom }}" +matrix_ldap_registration_proxy_systemd_wanted_services_list_default: ['docker.service'] +matrix_ldap_registration_proxy_systemd_wanted_services_list_auto: [] +matrix_ldap_registration_proxy_systemd_wanted_services_list_custom: [] # Additional environment variables to pass to the LDAP proxy environment variables. #