From 8f04d9b5967685441179d1d0ba8dcdcc2c20698d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bergr=C3=BCbe?=
 <68869895+Bergruebe@users.noreply.github.com>
Date: Sun, 24 Mar 2024 17:21:54 +0100
Subject: [PATCH 1/2] added _auto to gitea_container_additional_networks

to not overwrite gitea_container_additional_networks_custom
---
 templates/group_vars_mash_servers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/group_vars_mash_servers b/templates/group_vars_mash_servers
index 2a47903..6677706 100644
--- a/templates/group_vars_mash_servers
+++ b/templates/group_vars_mash_servers
@@ -1970,7 +1970,7 @@ gitea_systemd_required_systemd_services_list: |
     ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and gitea_config_database_hostname == devture_postgres_identifier else [])
   }}
 
-gitea_container_additional_networks: |
+gitea_container_additional_networks_auto: |
   {{
     ([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else [])
     +

From 241670b87ce4253332fe65ed996272644a14a78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bergr=C3=BCbe?=
 <68869895+Bergruebe@users.noreply.github.com>
Date: Sun, 24 Mar 2024 19:03:30 +0100
Subject: [PATCH 2/2] supports exim_relay in Gitea

---
 templates/group_vars_mash_servers | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/templates/group_vars_mash_servers b/templates/group_vars_mash_servers
index 6677706..33d4f24 100644
--- a/templates/group_vars_mash_servers
+++ b/templates/group_vars_mash_servers
@@ -1975,6 +1975,8 @@ gitea_container_additional_networks_auto: |
     ([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else [])
     +
     ([devture_postgres_container_network] if devture_postgres_enabled and gitea_config_database_hostname == devture_postgres_identifier and gitea_container_network != devture_postgres_container_network else [])
+    +
+    ([exim_relay_container_network | default('mash-exim-relay')] if (exim_relay_enabled | default(false) and gitea_config_mailer_smtp_addr == exim_relay_identifier | default('mash-exim-relay') and gitea_container_network != exim_relay_container_network) else [])
   }}
 
 gitea_container_labels_traefik_enabled: "{{ mash_playbook_traefik_labels_enabled }}"
@@ -1987,6 +1989,14 @@ gitea_config_database_port: "{{ '5432' if devture_postgres_enabled else '' }}"
 gitea_config_database_username: "gitea"
 gitea_config_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'db.gitea', rounds=655555) | to_uuid }}"
 
+# role-specific:exim_relay
+gitea_config_mailer_enabled: "{{ 'true' if exim_relay_enabled else '' }}"
+gitea_config_mailer_smtp_addr: "{{ exim_relay_identifier if exim_relay_enabled else '' }}"
+gitea_config_mailer_smtp_port: 8025
+gitea_config_mailer_from: "{{ exim_relay_sender_address if exim_relay_enabled else '' }}"
+gitea_config_mailer_protocol: "{{ 'smtp' if exim_relay_enabled else '' }}"
+# /role-specific:exim_relay
+
 ########################################################################
 #                                                                      #
 # /gitea                                                               #