From 5fea0f0ad50f7a71cd4e7bf6f8d6e5c9603add4a Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@cccv.de>
Date: Thu, 31 Mar 2022 02:45:35 +0200
Subject: [PATCH] Add gitlab.mail.reply_to option
---
defaults/main.yml | 1 +
templates/gitlab.rb.j2 | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 538a205..dfbbd16 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -30,3 +30,4 @@ gitlab:
upload_size_max: 128M
mail: {}
#from: 'git@domain'
+ #reply_to: 'git@domain'
diff --git a/templates/gitlab.rb.j2 b/templates/gitlab.rb.j2
index 476f2e0..0e8506a 100644
--- a/templates/gitlab.rb.j2
+++ b/templates/gitlab.rb.j2
@@ -76,7 +76,9 @@ gitlab_rails['gitlab_ssh_host'] = '{{ gitlab.gitlab_ssh_host }}'
gitlab_rails['gitlab_email_from'] = '{{ gitlab.mail.from }}'
{% endif %}
# gitlab_rails['gitlab_email_display_name'] = 'Example'
-# gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
+{% if gitlab.mail.reply_to %}
+gitlab_rails['gitlab_email_reply_to'] = '{{ gitlab.mail.reply_to }}'
+{% endif %}
# gitlab_rails['gitlab_email_subject_suffix'] = ''
# gitlab_rails['gitlab_email_smime_enabled'] = false
# gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key'
--
GitLab