1
0
Fork 0

Merge pull request from IUCCA/main

Adapt SMTP group vars for Tandoor after role changes
This commit is contained in:
Slavi Pantaleev 2024-04-08 17:01:34 +03:00 committed by GitHub
commit 255c938e81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -4605,7 +4605,7 @@ tandoor_systemd_required_services_list_auto: |
tandoor_systemd_wanted_services_list_auto: |
{{
([(exim_relay_identifier | default('mash-exim-relay')) ~ '.service'] if (exim_relay_enabled | default(false) and tandoor_config_parameter_mail_smtphost == exim_relay_identifier | default('mash-exim-relay')) else [])
([(exim_relay_identifier | default('mash-exim-relay')) ~ '.service'] if (exim_relay_enabled | default(false) and tandoor_email_host == exim_relay_identifier | default('mash-exim-relay')) else [])
}}
tandoor_api_container_additional_networks_auto: |
@ -4613,7 +4613,7 @@ tandoor_api_container_additional_networks_auto: |
(
([devture_postgres_container_network] if devture_postgres_enabled and tandoor_database_hostname == devture_postgres_identifier and tandoor_container_network != devture_postgres_container_network else [])
+
([exim_relay_container_network | default('mash-exim-relay')] if (exim_relay_enabled | default(false) and tandoor_config_parameter_mail_smtphost == exim_relay_identifier | default('mash-exim-relay') and tandoor_container_network != exim_relay_container_network) else [])
([exim_relay_container_network | default('mash-exim-relay')] if (exim_relay_enabled | default(false) and tandoor_email_host == exim_relay_identifier | default('mash-exim-relay') and tandoor_container_network != exim_relay_container_network) else [])
) | unique
}}