From 7f555a86c37664fe7ec847d92f08adb2f5e5c395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Sun, 14 Apr 2024 11:23:32 +0200
Subject: [PATCH] =?UTF-8?q?[mod]=20role:gitlab:SMTP-Anbindung=20hinzugef?=
 =?UTF-8?q?=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/gitlab/defaults/main.json     |  6 ++++++
 roles/gitlab/templates/gitlab.rb.j2 | 18 +++++++++++-------
 roles/gitlab/vardef.json            | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/roles/gitlab/defaults/main.json b/roles/gitlab/defaults/main.json
index 6cb5ff5..828eea6 100644
--- a/roles/gitlab/defaults/main.json
+++ b/roles/gitlab/defaults/main.json
@@ -14,5 +14,11 @@
 	"var_gitlab_authentication_data_authelia_client_id": "gitlab",
 	"var_gitlab_authentication_data_authelia_client_secret": "REPLACE_ME",
 	"var_gitlab_authentication_data_authelia_label": "Authelia",
+	"var_gitlab_smtp_enable": false,
+	"var_gitlab_smtp_host": "smtp.example.org",
+	"var_gitlab_smtp_port": 465,
+	"var_gitlab_smtp_username": "gitlab",
+	"var_gitlab_smtp_password": "REPLACE_ME",
+	"var_gitlab_smtp_sender": "gitlab@example.org",
 	"var_gitlab_use_bundled_webserver": true
 }
diff --git a/roles/gitlab/templates/gitlab.rb.j2 b/roles/gitlab/templates/gitlab.rb.j2
index a789316..b5e80ad 100644
--- a/roles/gitlab/templates/gitlab.rb.j2
+++ b/roles/gitlab/templates/gitlab.rb.j2
@@ -82,16 +82,20 @@ external_url 'http://{{var_gitlab_domain}}'
 ###! Docs: https://docs.gitlab.com/omnibus/settings/smtp.html
 ###! **Use smtp instead of sendmail/postfix.**
 
-# gitlab_rails['smtp_enable'] = true
-# gitlab_rails['smtp_address'] = "smtp.server"
-# gitlab_rails['smtp_port'] = 465
-# gitlab_rails['smtp_user_name'] = "smtp user"
-# gitlab_rails['smtp_password'] = "smtp password"
+{% if not var_gitlab_smtp_enable %}
+gitlab_rails['smtp_enable'] = false
+{% else %}
+gitlab_rails['smtp_enable'] = true
+gitlab_rails['smtp_address'] = "{{var_gitlab_smtp_host}}"
+# gitlab_rails['smtp_port'] = {{var_gitlab_smtp_port | string}}
+# gitlab_rails['smtp_user_name'] = "{{var_gitlab_smtp_username}}"
+# gitlab_rails['smtp_password'] = "{{var_gitlab_smtp_password}}"
 # gitlab_rails['smtp_domain'] = "example.com"
-# gitlab_rails['smtp_authentication'] = "login"
-# gitlab_rails['smtp_enable_starttls_auto'] = true
+gitlab_rails['smtp_authentication'] = "login"
+gitlab_rails['smtp_enable_starttls_auto'] = true
 # gitlab_rails['smtp_tls'] = false
 # gitlab_rails['smtp_pool'] = false
+{% endif %}
 
 ###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
 ###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html
diff --git a/roles/gitlab/vardef.json b/roles/gitlab/vardef.json
index 919480f..e9d84a6 100644
--- a/roles/gitlab/vardef.json
+++ b/roles/gitlab/vardef.json
@@ -48,6 +48,30 @@
 		"type": "string",
 		"mandatory": false
 	},
+	"smtp_enable": {
+		"type": "boolean",
+		"mandatory": false
+	},
+	"smtp_host": {
+		"type": "string",
+		"mandatory": false
+	},
+	"smtp_port": {
+		"type": "integer",
+		"mandatory": false
+	},
+	"smtp_username": {
+		"type": "string",
+		"mandatory": false
+	},
+	"smtp_password": {
+		"type": "string",
+		"mandatory": false
+	},
+	"smtp_sender": {
+		"type": "string",
+		"mandatory": false
+	},
 	"use_bundled_webserver": {
 		"type": "boolean",
 		"mandatory": false