Replacing mistake from smtp grafana to gitlab smtp

This commit is contained in:
2026-06-30 12:40:04 +00:00
parent e68cde0b73
commit 62092d1370
+23 -24
View File
@@ -82,15 +82,15 @@ external_url 'https://{{ env "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"
# gitlab_rails['smtp_domain'] = "example.com"
# gitlab_rails['smtp_authentication'] = "login"
# gitlab_rails['smtp_enable_starttls_auto'] = true
# gitlab_rails['smtp_tls'] = false
gitlab_rails['smtp_enable'] = "{{ env "SMTP_ENABLE_FLAG" }}"
gitlab_rails['smtp_address'] = "{{ env "SMTP_HOST" }}"
gitlab_rails['smtp_port'] = "{{ env "SMTP_PORT" }}"
gitlab_rails['smtp_user_name'] = "{{ env "SMTP_USER" }}"
gitlab_rails['smtp_password'] = "{{ secret "smtp_password" }}"
gitlab_rails['smtp_domain'] = "{{ env "SMTP_DOMAIN" }}"
gitlab_rails['smtp_authentication'] = "login"
gitlab_rails['smtp_enable_starttls_auto'] = true
gitlab_rails['smtp_tls'] = false
# gitlab_rails['smtp_pool'] = false
###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
@@ -2291,24 +2291,23 @@ registry_nginx['listen_https'] = false
# grafana['metrics_basic_auth_password'] = 'please_set_a_unique_password' # default: nil
# grafana['alerting_enabled'] = false
### SMTP Configuration
### SMTP Configuration
#
# See: http://docs.grafana.org/administration/configuration/#smtp
#
grafana['smtp'] = {
'enabled' => '{{ env "SMTP_ENABLE_FLAG" }}',
'host' => '{{ env "SMTP_HOST" }}:{{ env "SMTP_PORT" }}',
'user' => '{{ env "SMTP_USER" }}',
'password' => '{{ secret "smtp_password" }}',
'cert_file' => nil,
'key_file' => nil,
'skip_verify' => false,
'from_address' => '{{ env "SMTP_FROM_ADDRESS" }}',
'from_name' => '{{ env "SMTP_FROM_NAME" }}',
'ehlo_identity' => '{{ env "SMTP_EHLO" }}',
'startTLS_policy' => '{{ env "SMTP_STARTTLS_FLAG" }}'
}
# grafana['smtp'] = {
# 'enabled' => {{ env "SMTP_ENABLE_FLAG" }},
# 'host' => '{{ env "SMTP_HOST" }}:{{ env "SMTP_PORT" }}',
# 'user' => {{ env "SMTP_USER" }},
# 'password' => {{ secret "smtp_password" }},
# 'cert_file' => nil,
# 'key_file' => nil,
# 'skip_verify' => false,
# 'from_address' => '{{ env "SMTP_FROM_ADDRESS" }}',
# 'from_name' => '{{ env "SMTP_FROM_NAME" }}',
# 'ehlo_identity' => '{{ env "SMTP_EHLO" }}',
# 'startTLS_policy' => {{ env "SMTP_STARTTLS_FLAG" }}
# }
# Grafana usage reporting defaults to gitlab_rails['usage_ping_enabled']
# grafana['reporting_enabled'] = true